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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: only link in curl directories that exist, this will help with vs6 nmake


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/CMakeLists.txt,v
retrieving revision 1.66
retrieving revision 1.67
diff -C 2 -d -r1.66 -r1.67
*** CMakeLists.txt	19 Nov 2008 06:15:41 -0000	1.66
--- CMakeLists.txt	20 Nov 2008 19:06:57 -0000	1.67
***************
*** 14,20 ****
    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)
  ENDIF(COMPLEX_TEST_CMAKELIB)
--- 14,23 ----
    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)
!   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)