[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.147 1.148

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv32398

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: check in ability to build with new curl -f -DCMAKE_USE_NEW_CURL is set


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.147
retrieving revision 1.148
diff -C 2 -d -r1.147 -r1.148
*** CMakeLists.txt	4 Apr 2008 20:02:49 -0000	1.147
--- CMakeLists.txt	29 Sep 2008 19:47:45 -0000	1.148
***************
*** 228,233 ****
    # Utilities directory.
    INCLUDE_DIRECTORIES(
-     ${CMake_SOURCE_DIR}/Utilities
      ${CMake_BINARY_DIR}/Utilities
      )
    
--- 228,233 ----
    # Utilities directory.
    INCLUDE_DIRECTORIES(
      ${CMake_BINARY_DIR}/Utilities
+     ${CMake_SOURCE_DIR}/Utilities
      )
    
***************
*** 270,274 ****
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)
!     SUBDIRS(Utilities/cmcurl)
    ENDIF(CMAKE_USE_SYSTEM_CURL)
  
--- 270,280 ----
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)
!     IF(CMAKE_USE_NEW_CURL)
!       # for cmake never build examples
!       SET(CURL_SKIP_EXAMPLES TRUE)
!       ADD_SUBDIRECTORY(Utilities/cmcurl-7.19.0)
!     ELSE(CMAKE_USE_NEW_CURL)
!       SUBDIRS(Utilities/cmcurl)
!     ENDIF(CMAKE_USE_NEW_CURL)
    ENDIF(CMAKE_USE_SYSTEM_CURL)