From 32ac624352e074bc7f9d948574e22f4c3d7f3c5c Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 18 Nov 2008 09:37:31 -0500 Subject: [PATCH] ENH: make it work if new curl is on --- Tests/Complex/Executable/CMakeLists.txt | 6 +++++- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 6 +++++- Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 9f64cbb15..8d5743b85 100644 --- 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) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 9f64cbb15..8d5743b85 100644 --- 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) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 9f64cbb15..8d5743b85 100644 --- 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)