mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: make it work if new curl is on

Browse Source
This commit is contained in:
Bill Hoffman
2008-11-19 01:15:41 -05:00
parent b77f1c324c
commit bc1f0e1b11
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/Complex/Executable/CMakeLists.txt
View File

@@ -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)

7
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@@ -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)

7
Tests/ComplexRelativePaths/Executable/CMakeLists.txt
View File

@@ -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)