diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-11-19 06:15:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-11-19 06:15:41 (GMT) |
| commit | bc1f0e1b11c0a70b386e946597f8efcddada9d66 (patch) | |
| tree | b9b3199c8b3c9e76cba27a188250bfd34efdf7c6 | |
| parent | b77f1c324cf078fc68f24e0a59f5529fd5de7b7a (diff) | |
| download | CMake-bc1f0e1b11c0a70b386e946597f8efcddada9d66.zip CMake-bc1f0e1b11c0a70b386e946597f8efcddada9d66.tar.gz CMake-bc1f0e1b11c0a70b386e946597f8efcddada9d66.tar.bz2 | |
ENH: make it work if new curl is on
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 8d5743b..8efa373 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -12,10 +12,9 @@ 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) - 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) + # prefer the new curl if it is around + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(CMAKE_USE_NEW_CURL) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) ENDIF(COMPLEX_TEST_CMAKELIB) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 8d5743b..8efa373 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -12,10 +12,9 @@ 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) - 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) + # prefer the new curl if it is around + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(CMAKE_USE_NEW_CURL) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) ENDIF(COMPLEX_TEST_CMAKELIB) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 8d5743b..8efa373 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -12,10 +12,9 @@ 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) - 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) + # prefer the new curl if it is around + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(CMAKE_USE_NEW_CURL) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) ENDIF(COMPLEX_TEST_CMAKELIB) |