Selaa lähdekoodia

ENH: make it work if new curl is on

Bill Hoffman 17 vuotta sitten
vanhempi
sitoutus
32ac624352

+ 5 - 1
Tests/Complex/Executable/CMakeLists.txt

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  IF(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ELSE(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(CMAKE_USE_NEW_CURL)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 

+ 5 - 1
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  IF(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ELSE(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(CMAKE_USE_NEW_CURL)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 

+ 5 - 1
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  IF(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ELSE(CMAKE_USE_NEW_CURL)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(CMAKE_USE_NEW_CURL)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)