diff options
| -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) |