summaryrefslogtreecommitdiffstats
path: root/Tests/Complex
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-11-20 19:06:57 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-11-20 19:06:57 (GMT)
commit0f88ea399309ee680d608dcd2b92921f1f061874 (patch)
tree31bb63ab8da8e3de3f6f954353e7950456772d5e /Tests/Complex
parent3e232c871ab017a1ce8ced533a6ac867b1f15dbc (diff)
downloadCMake-0f88ea399309ee680d608dcd2b92921f1f061874.zip
CMake-0f88ea399309ee680d608dcd2b92921f1f061874.tar.gz
CMake-0f88ea399309ee680d608dcd2b92921f1f061874.tar.bz2
ENH: only link in curl directories that exist, this will help with vs6 nmake
Diffstat (limited to 'Tests/Complex')
-rw-r--r--Tests/Complex/Executable/CMakeLists.txt9
1 files changed, 6 insertions, 3 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)