From 46b9a884ac01aeb7fc0e6b5eb92a1624536eb4ee Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 21 Nov 2008 16:10:09 -0500 Subject: ENH: make this test pass if new curl is on --- Tests/Complex/Executable/CMakeLists.txt | 2 +- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 2 +- Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 86fb7a5..6f47838 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -14,7 +14,7 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # prefer the new curl if it is around IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0/lib) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 86fb7a5..6f47838 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -14,7 +14,7 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # prefer the new curl if it is around IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0/lib) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 86fb7a5..6f47838 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -14,7 +14,7 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # prefer the new curl if it is around IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0/lib) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) -- cgit v0.12