ENH: make it work if new curl is on

32ac6243 · Bill Hoffman · 1f9d9b20 · 32ac6243 · 32ac6243 · 32ac6243
Commit 32ac6243 authored 16 years ago by Bill Hoffman
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/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)


--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/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)


--- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
+++ b/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)