summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-01-11 15:57:25 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-01-11 15:57:25 (GMT)
commita0ffb9293f506a6d8a6500031354cc482340c919 (patch)
tree5d7c484fd9ee4e0e1926d85c24991c1c5e8e2770
parentaeb08658107e925476f97668233fb6ae85063099 (diff)
downloadCMake-a0ffb9293f506a6d8a6500031354cc482340c919.zip
CMake-a0ffb9293f506a6d8a6500031354cc482340c919.tar.gz
CMake-a0ffb9293f506a6d8a6500031354cc482340c919.tar.bz2
Fix testing of curl on windows
-rw-r--r--Source/CMakeLists.txt2
-rw-r--r--Source/CTest/Curl/CMakeLists.txt4
-rw-r--r--Source/CTest/Curl/Platforms/WindowsCache.cmake2
3 files changed, 5 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3e5dc40..8f9b147 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -276,7 +276,7 @@ IF(BUILD_TESTING)
ADD_TEST(curl ${CMake_BINARY_DIR}/Source/cmaketest
${CMake_SOURCE_DIR}/Source/CTest/Curl
${CMake_BINARY_DIR}/Tests/Curl
- curltest)
+ LIBCURL)
IF (APPLE)
ADD_TEST(objc++ ${CMake_BINARY_DIR}/Source/cmaketest
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index 7a2c64f..06d5d91 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -356,5 +356,5 @@ IF(CURL_TESTING)
SUBDIRS(Testing)
ENDIF(CURL_TESTING)
-ADD_EXECUTABLE(curltest Testing/curltest.c)
-TARGET_LINK_LIBRARIES(curltest Curl) \ No newline at end of file
+ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
+TARGET_LINK_LIBRARIES(LIBCURL Curl) \ No newline at end of file
diff --git a/Source/CTest/Curl/Platforms/WindowsCache.cmake b/Source/CTest/Curl/Platforms/WindowsCache.cmake
index bbff050..99cf40e 100644
--- a/Source/CTest/Curl/Platforms/WindowsCache.cmake
+++ b/Source/CTest/Curl/Platforms/WindowsCache.cmake
@@ -1,4 +1,6 @@
IF(WIN32)
+ SET(HAVE_LIBWINMM 1)
+ SET(HAVE_LIBWS2_32 1)
SET(HAVE_GETHOSTNAME 1)
SET(HAVE_GETHOSTBYADDR 1)
SET(HAVE_GETSERVBYNAME 1)