From bc1f0e1b11c0a70b386e946597f8efcddada9d66 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 19 Nov 2008 01:15:41 -0500 Subject: [PATCH] ENH: make it work if new curl is on --- Tests/Complex/Executable/CMakeLists.txt | 7 +++---- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 7 +++---- 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 8d5743b85..8efa373d6 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 8d5743b85..8efa373d6 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 8d5743b85..8efa373d6 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)