Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

ENH: make it work if new curl is on

Bill Hoffman 17 years ago
parent
1f9d9b2050
commit
32ac624352
3 changed files with 15 additions and 3 deletions
Unified View Show Diff Stats
  1. 5 1
      Tests/Complex/Executable/CMakeLists.txt
  2. 5 1
      Tests/ComplexOneConfig/Executable/CMakeLists.txt
  3. 5 1
      Tests/ComplexRelativePaths/Executable/CMakeLists.txt

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

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
 
   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)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)

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

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
 
   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)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)

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

@@ -12,7 +12,11 @@ IF(COMPLEX_TEST_CMAKELIB)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
 
   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)
 
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)
 
 ENDIF(COMPLEX_TEST_CMAKELIB)