Require CMake to link against the downloaded curl library on Windows. Part 3 in a series of commits that will add CMake support for downloading and linking against the curl library on Windows.
Review: https://reviews.apache.org/r/36970 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/64cf98e0 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/64cf98e0 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/64cf98e0 Branch: refs/heads/master Commit: 64cf98e0270981a856fc8e15fa358e8249b3e21e Parents: cf9740a Author: Benjamin Hindman <[email protected]> Authored: Sat Aug 1 15:19:03 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Sat Aug 1 15:19:03 2015 -0700 ---------------------------------------------------------------------- .../3rdparty/stout/cmake/StoutTestsConfigure.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/64cf98e0/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake index 0dab6a4..d699206 100644 --- a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake +++ b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake @@ -48,6 +48,7 @@ endif (WIN32) # download/configure/build all third-party libraries before attempting to build. ################################################################################ set(STOUT_TEST_DEPENDENCIES + ${STOUT_TEST_DEPENDENCIES} ${BOOST_TARGET} ${GLOG_TARGET} ${GMOCK_TARGET} @@ -55,6 +56,13 @@ set(STOUT_TEST_DEPENDENCIES ${PROTOBUF_TARGET} ) +if (WIN32) + set(STOUT_TEST_DEPENDENCIES + ${STOUT_TEST_DEPENDENCIES} + ${CURL_TARGET} + ) +endif(WIN32) + # DEFINE THIRD-PARTY INCLUDE DIRECTORIES. Tells compiler toolchain where to get # headers for our third party libs (e.g., -I/path/to/glog on Linux).. ############################################################################### @@ -75,6 +83,7 @@ if (WIN32) set(STOUT_TEST_INCLUDE_DIRS ${STOUT_TEST_INCLUDE_DIRS} ${GLOG_ROOT}/src/windows + ${CURL_ROOT}/include ) else (WIN32) set(STOUT_TEST_INCLUDE_DIRS @@ -106,6 +115,7 @@ if (WIN32) ${GLOG_ROOT}/Debug ${GMOCK_ROOT}/msvc/2010/Debug ${PROTOBUF_ROOT}/vsprojects/Debug + ${CURL_ROOT}/lib ) else (WIN32) set(STOUT_TEST_LIB_DIRS @@ -135,6 +145,7 @@ if (WIN32) ${STOUT_TEST_LIBS} libglog libprotobuf + libcurl_a ) else (WIN32) set(STOUT_TEST_LIBS
