[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.152 1.153 CTestCustom.cmake.in 1.5 1.6
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jun 11 11:24:58 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv18004
Modified Files:
CMakeLists.txt CTestCustom.cmake.in
Log Message:
ENH: Disable the xmlrpc drop method by default
We've chosen to drop our default dependence on xmlrpc. Thus we disable
the corresponding CTest submission method and remove the sources for
building xmlrpc locally. Users can re-enable the method by setting the
CTEST_USE_XMLRPC option to use a system-installed xmlrpc library.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.152
retrieving revision 1.153
diff -C 2 -d -r1.152 -r1.153
*** CMakeLists.txt 11 Jun 2009 13:04:25 -0000 1.152
--- CMakeLists.txt 11 Jun 2009 15:24:55 -0000 1.153
***************
*** 17,20 ****
--- 17,24 ----
INCLUDE(CMakeDependentOption)
+ # Optionally use system xmlrpc. We no longer build or use it by default.
+ OPTION(CTEST_USE_XMLRPC "Enable xmlrpc submission method in CTest." OFF)
+ MARK_AS_ADVANCED(CTEST_USE_XMLRPC)
+
# Allow the user to enable/disable all system utility library options
# by setting CMAKE_USE_SYSTEM_LIBRARIES on the command line.
***************
*** 32,37 ****
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)
--- 36,39 ----
***************
*** 39,48 ****
# 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)
--- 41,48 ----
# Optionally use system utility libraries.
! CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_CURL "Use system-installed curl"
! ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CTEST_USE_XMLRPC" ON)
CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_EXPAT "Use system-installed expat"
! ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CTEST_USE_XMLRPC" ON)
CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib"
${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
***************
*** 295,311 ****
#---------------------------------------------------------------------
# Build XMLRPC library for CMake and CTest.
! IF(CMAKE_USE_SYSTEM_XMLRPC)
FIND_PACKAGE(XMLRPC QUIET REQUIRED libwww-client)
IF(NOT XMLRPC_FOUND)
MESSAGE(FATAL_ERROR
! "CMAKE_USE_SYSTEM_XMLRPC is ON but a xmlrpc is not found!")
ENDIF(NOT XMLRPC_FOUND)
SET(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
SET(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
! ELSE(CMAKE_USE_SYSTEM_XMLRPC)
! SET(CMAKE_XMLRPC_INCLUDES)
! SET(CMAKE_XMLRPC_LIBRARIES cmXMLRPC)
! SUBDIRS(Utilities/cmxmlrpc)
! ENDIF(CMAKE_USE_SYSTEM_XMLRPC)
#---------------------------------------------------------------------
--- 295,307 ----
#---------------------------------------------------------------------
# Build XMLRPC library for CMake and CTest.
! IF(CTEST_USE_XMLRPC)
FIND_PACKAGE(XMLRPC QUIET REQUIRED libwww-client)
IF(NOT XMLRPC_FOUND)
MESSAGE(FATAL_ERROR
! "CTEST_USE_XMLRPC is ON but xmlrpc is not found!")
ENDIF(NOT XMLRPC_FOUND)
SET(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
SET(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
! ENDIF(CTEST_USE_XMLRPC)
#---------------------------------------------------------------------
***************
*** 427,432 ****
! # The same might be true on other systems for other libraries if
! # CMAKE_USE_SYSTEM_XMLRPC or other variables like this are enabled.
# Then only enable RPATH if we have are building at least with cmake 2.4,
# since this one has much better RPATH features than cmake 2.2.
--- 423,427 ----
! # The same might be true on other systems for other libraries.
# Then only enable RPATH if we have are building at least with cmake 2.4,
# since this one has much better RPATH features than cmake 2.2.
***************
*** 435,444 ****
IF (UNIX)
IF( CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
! OR CMAKE_USE_SYSTEM_EXPAT OR CMAKE_USE_SYSTEM_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF(CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
! OR CMAKE_USE_SYSTEM_EXPAT OR CMAKE_USE_SYSTEM_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
ENDIF (UNIX)
--- 430,439 ----
IF (UNIX)
IF( CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
! OR CMAKE_USE_SYSTEM_EXPAT OR CTEST_USE_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF(CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
! OR CMAKE_USE_SYSTEM_EXPAT OR CTEST_USE_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
ENDIF (UNIX)
Index: CTestCustom.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestCustom.cmake.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CTestCustom.cmake.in 6 Jan 2009 20:05:01 -0000 1.5
--- CTestCustom.cmake.in 11 Jun 2009 15:24:55 -0000 1.6
***************
*** 13,17 ****
"stl_deque.h:479"
"Utilities.cmzlib."
- "Utilities.cmxmlrpc."
"Source.CTest.Curl"
"Utilities.cmcurl"
--- 13,16 ----
More information about the Cmake-commits
mailing list