From 0f88ea399309ee680d608dcd2b92921f1f061874 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 20 Nov 2008 14:06:57 -0500 Subject: ENH: only link in curl directories that exist, this will help with vs6 nmake --- Tests/Complex/Executable/CMakeLists.txt | 9 ++++++--- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 9 ++++++--- Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 8efa373..86fb7a5 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # 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) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) 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 8efa373..86fb7a5 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # 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) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) 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 8efa373..86fb7a5 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) # 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) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0) + IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) + LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) + ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) ENDIF(COMPLEX_TEST_CMAKELIB) -- cgit v0.12