[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.150 1.151

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Simplify decision to use system libraries

Previously we disallowed use of system libraries if FindXMLRPC.cmake was
not available.  Now that CMake 2.4 is required to build, the module is
always available.  This change simplifies the logic accordingly.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.150
retrieving revision 1.151
diff -C 2 -d -r1.150 -r1.151
*** CMakeLists.txt	10 Apr 2009 15:59:31 -0000	1.150
--- CMakeLists.txt	11 Jun 2009 13:04:04 -0000	1.151
***************
*** 14,70 ****
  #-----------------------------------------------------------------------
  MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
!   # Third party libraries must be something that can be found.
!   IF(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
!     SET(CMAKE_ALLOW_SYSTEM_LIBRARIES 1)
!   ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
!     SET(CMAKE_ALLOW_SYSTEM_LIBRARIES 0)
!   ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
!   
!   IF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
!     # Options have dependencies.
!     INCLUDE(CMakeDependentOption)
!     
!     # Allow the user to enable/disable all system utility library options
!     # by setting CMAKE_USE_SYSTEM_LIBRARIES on the command line.
!     IF(DEFINED CMAKE_USE_SYSTEM_LIBRARIES)
!       SET(CMAKE_USE_SYSTEM_LIBRARIES_USER 1)
!     ENDIF(DEFINED CMAKE_USE_SYSTEM_LIBRARIES)
!     IF(CMAKE_USE_SYSTEM_LIBRARIES)
!       SET(CMAKE_USE_SYSTEM_LIBRARIES ON)
!     ELSE(CMAKE_USE_SYSTEM_LIBRARIES)
!       SET(CMAKE_USE_SYSTEM_LIBRARIES OFF)
!     ENDIF(CMAKE_USE_SYSTEM_LIBRARIES)
!     IF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
!       SET(CMAKE_USE_SYSTEM_CURL "${CMAKE_USE_SYSTEM_LIBRARIES}" 
!         CACHE BOOL "Use system-installed curl" FORCE)
!       SET(CMAKE_USE_SYSTEM_EXPAT "${CMAKE_USE_SYSTEM_LIBRARIES}" 
!         CACHE BOOL "Use system-installed expat" FORCE)
!       SET(CMAKE_USE_SYSTEM_XMLRPC "${CMAKE_USE_SYSTEM_LIBRARIES}" 
!         CACHE BOOL "Use system-installed xmlrpc" FORCE)
!       SET(CMAKE_USE_SYSTEM_ZLIB "${CMAKE_USE_SYSTEM_LIBRARIES}" 
!         CACHE BOOL "Use system-installed zlib" FORCE)
!     ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
!     
!     # Optionally use system utility libraries.
!     OPTION(CMAKE_USE_SYSTEM_CURL   "Use system-installed curl" 
!       ${CMAKE_USE_SYSTEM_LIBRARIES})
!     OPTION(CMAKE_USE_SYSTEM_XMLRPC "Use system-installed xmlrpc" 
!       ${CMAKE_USE_SYSTEM_LIBRARIES})
!     CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_EXPAT "Use system-installed expat"
!       ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_XMLRPC" ON)
!     CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib"
!       ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
!     
!     # There is currently no option for system tar because the upstream
!     # libtar does not have our modifications to allow reentrant
!     # object-oriented use of the library.
!     # OPTION(CMAKE_USE_SYSTEM_TAR    "Use system-installed tar"   OFF)
!   ELSE(CMAKE_ALLOW_SYSTEM_LIBRARIES)
!     SET(CMAKE_USE_SYSTEM_CURL 0)
!     SET(CMAKE_USE_SYSTEM_EXPAT 0)
!     SET(CMAKE_USE_SYSTEM_XMLRPC 0)
!     SET(CMAKE_USE_SYSTEM_ZLIB 0)
!   ENDIF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
  
  
    # Mention to the user what system libraries are being used.
--- 14,55 ----
  #-----------------------------------------------------------------------
  MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
!   # Options have dependencies.
!   INCLUDE(CMakeDependentOption)
! 
!   # Allow the user to enable/disable all system utility library options
!   # by setting CMAKE_USE_SYSTEM_LIBRARIES on the command line.
!   IF(DEFINED CMAKE_USE_SYSTEM_LIBRARIES)
!     SET(CMAKE_USE_SYSTEM_LIBRARIES_USER 1)
!   ENDIF(DEFINED CMAKE_USE_SYSTEM_LIBRARIES)
!   IF(CMAKE_USE_SYSTEM_LIBRARIES)
!     SET(CMAKE_USE_SYSTEM_LIBRARIES ON)
!   ELSE(CMAKE_USE_SYSTEM_LIBRARIES)
!     SET(CMAKE_USE_SYSTEM_LIBRARIES OFF)
!   ENDIF(CMAKE_USE_SYSTEM_LIBRARIES)
!   IF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
!     SET(CMAKE_USE_SYSTEM_CURL "${CMAKE_USE_SYSTEM_LIBRARIES}"
!       CACHE BOOL "Use system-installed curl" FORCE)
!     SET(CMAKE_USE_SYSTEM_EXPAT "${CMAKE_USE_SYSTEM_LIBRARIES}"
!       CACHE BOOL "Use system-installed expat" FORCE)
!     SET(CMAKE_USE_SYSTEM_XMLRPC "${CMAKE_USE_SYSTEM_LIBRARIES}"
!       CACHE BOOL "Use system-installed xmlrpc" FORCE)
!     SET(CMAKE_USE_SYSTEM_ZLIB "${CMAKE_USE_SYSTEM_LIBRARIES}"
!       CACHE BOOL "Use system-installed zlib" FORCE)
!   ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
! 
!   # Optionally use system utility libraries.
!   OPTION(CMAKE_USE_SYSTEM_CURL   "Use system-installed curl"
!     ${CMAKE_USE_SYSTEM_LIBRARIES})
!   OPTION(CMAKE_USE_SYSTEM_XMLRPC "Use system-installed xmlrpc"
!     ${CMAKE_USE_SYSTEM_LIBRARIES})
!   CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_EXPAT "Use system-installed expat"
!     ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_XMLRPC" ON)
!   CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib"
!     ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
  
+   # There is currently no option for system tar because the upstream
+   # libtar does not have our modifications to allow reentrant
+   # object-oriented use of the library.
+   # OPTION(CMAKE_USE_SYSTEM_TAR    "Use system-installed tar"   OFF)
  
    # Mention to the user what system libraries are being used.