[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.65 1.66

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Nov 19 01:15:43 EST 2008


Update of /cvsroot/CMake/CMake/Tests/Complex/Executable
In directory public:/mounts/ram/cvs-serv22986

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: make it work if new curl is on


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/CMakeLists.txt,v
retrieving revision 1.65
retrieving revision 1.66
diff -C 2 -d -r1.65 -r1.66
*** CMakeLists.txt	18 Nov 2008 14:37:31 -0000	1.65
--- CMakeLists.txt	19 Nov 2008 06:15:41 -0000	1.66
***************
*** 13,20 ****
    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)
    ENDIF(CMAKE_USE_NEW_CURL)
    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
--- 13,19 ----
    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)
    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)



More information about the Cmake-commits mailing list