[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.12 1.97.2.13
CTestCustom.ctest.in 1.15.2.2 1.15.2.3 ChangeLog.manual
1.1.8.19 1.1.8.20 bootstrap 1.83.2.4 1.83.2.5 doxygen.config
1.1 1.1.22.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 27 16:01:48 EDT 2006
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv22632
Modified Files:
Tag: CMake-2-4
CMakeLists.txt CTestCustom.ctest.in ChangeLog.manual bootstrap
doxygen.config
Log Message:
ENH: move changes from main tree
Index: CTestCustom.ctest.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestCustom.ctest.in,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- CTestCustom.ctest.in 26 Jul 2006 12:35:37 -0000 1.15.2.2
+++ CTestCustom.ctest.in 27 Oct 2006 20:01:46 -0000 1.15.2.3
@@ -10,14 +10,14 @@
"libcmcurl.*has no symbols"
"not sorted slower link editing will result"
"stl_deque.h:479"
- "Utilities/cmzlib/"
- "Utilities/cmxmlrpc/"
- "Source/CTest/Curl"
- "Utilities/cmcurl"
- "Source/CursesDialog/form"
+ "Utilities.cmzlib."
+ "Utilities.cmxmlrpc."
+ "Source.CTest.Curl"
+ "Utilities.cmcurl"
+ "Source.CursesDialog.form"
"/usr/bin/ld.*warning.*-..*directory.name.*bin.*does not exist"
"Redeclaration of .send..... with a different storage class specifier"
- "Utilities/cmexpat/"
+ "Utilities.cmexpat."
"is not used for resolving any symbol"
"Clock skew detected"
"remark\\(1209"
Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.83.2.4
retrieving revision 1.83.2.5
diff -u -d -r1.83.2.4 -r1.83.2.5
--- bootstrap 13 Oct 2006 14:52:01 -0000 1.83.2.4
+++ bootstrap 27 Oct 2006 20:01:46 -0000 1.83.2.5
@@ -36,6 +36,7 @@
cmake_doc_dir="/doc/cmake-${cmake_version}"
cmake_man_dir="/man"
cmake_init_file=""
+cmake_bootstrap_system_libs=""
# Determine whether this is a MinGW environment.
if echo "${cmake_system}" | grep MINGW >/dev/null 2>&1; then
@@ -205,6 +206,10 @@
--parallel=n bootstrap cmake in parallel, where n is
number of nodes [1]
--init=FILE use FILE for cmake initialization
+ --system-libs use system-installed third-party libraries
+ (for use only by package maintainers)
+ --no-system-libs use cmake-provided third-party libraries
+ (default)
Directory and file names:
--prefix=PREFIX install files in tree rooted at PREFIX
@@ -444,6 +449,12 @@
if echo $a | grep "^--init=" > /dev/null 2> /dev/null; then
cmake_init_file=`echo $a | sed "s/^--init=//"`
fi
+ if echo $a | grep "^--system-libs" > /dev/null 2> /dev/null; then
+ cmake_bootstrap_system_libs="-DCMAKE_USE_SYSTEM_LIBRARIES=1"
+ fi
+ if echo $a | grep "^--no-system-libs" > /dev/null 2> /dev/null; then
+ cmake_bootstrap_system_libs="-DCMAKE_USE_SYSTEM_LIBRARIES=0"
+ fi
if echo $a | grep "^--help" > /dev/null 2> /dev/null; then
cmake_usage
fi
@@ -1287,7 +1298,7 @@
export MAKE
# Run bootstrap CMake to configure real CMake
-"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}"
+"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_bootstrap_system_libs}
RES=$?
if [ "${RES}" -ne "0" ]; then
cmake_error 11 "Problem while running initial CMake"
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.12
retrieving revision 1.97.2.13
diff -u -d -r1.97.2.12 -r1.97.2.13
--- CMakeLists.txt 13 Oct 2006 14:52:00 -0000 1.97.2.12
+++ CMakeLists.txt 27 Oct 2006 20:01:46 -0000 1.97.2.13
@@ -71,27 +71,116 @@
SUBDIRS(Source/kwsys)
#-----------------------------------------------------------------------------
-# Build zlib library for Curl, CMake, and CTest.
-SUBDIRS(Utilities/cmzlib)
-SET(CMAKE_ZLIB_INCLUDES
- "${CMAKE_CURRENT_BINARY_DIR}/Utilities"
+# Setup third-party libraries.
+
+# Everything in the tree should be able to include files from the
+# Utilities directory.
+INCLUDE_DIRECTORIES(
+ ${CMake_SOURCE_DIR}/Utilities
+ ${CMake_BINARY_DIR}/Utilities
)
-SET(CMAKE_ZLIB_LIBRARIES "cmzlib")
-SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
-SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
-SET(CURL_SPECIAL_ZLIB_H "cmzlib/zlib.h")
+
+# 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)
+
+# Inform utility library header wrappers whether to use system versions.
+CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/cmThirdParty.h.in
+ ${CMake_BINARY_DIR}/Utilities/cmThirdParty.h
+ @ONLY IMMEDIATE)
+
+# Mention to the user what system libraries are being used.
+FOREACH(util CURL EXPAT XMLRPC ZLIB)
+ IF(CMAKE_USE_SYSTEM_${util})
+ MESSAGE(STATUS "Using system-installed ${util}")
+ ENDIF(CMAKE_USE_SYSTEM_${util})
+ENDFOREACH(util)
+
+#-----------------------------------------------------------------------------
+# Build zlib library for Curl, CMake, and CTest.
+SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
+IF(CMAKE_USE_SYSTEM_ZLIB)
+ FIND_PACKAGE(ZLIB)
+ IF(NOT ZLIB_FOUND)
+ MESSAGE(FATAL_ERROR "CMAKE_USE_SYSTEM_ZLIB is ON but a zlib is not found!")
+ ENDIF(NOT ZLIB_FOUND)
+ SET(CMAKE_ZLIB_INCLUDES ${ZLIB_INCLUDE_DIR})
+ SET(CMAKE_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
+ELSE(CMAKE_USE_SYSTEM_ZLIB)
+ SUBDIRS(Utilities/cmzlib)
+ SET(CMAKE_ZLIB_INCLUDES)
+ SET(CMAKE_ZLIB_LIBRARIES cmzlib)
+ENDIF(CMAKE_USE_SYSTEM_ZLIB)
#-----------------------------------------------------------------------------
# Build Curl library for CTest.
-SUBDIRS(Utilities/cmcurl)
-SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Utilities")
-SET(CMAKE_CURL_LIBRARIES "cmcurl")
+IF(CMAKE_USE_SYSTEM_CURL)
+ FIND_PACKAGE(CURL)
+ IF(NOT CURL_FOUND)
+ MESSAGE(FATAL_ERROR "CMAKE_USE_SYSTEM_CURL is ON but a curl is not found!")
+ ENDIF(NOT CURL_FOUND)
+ SET(CMAKE_CURL_INCLUDES ${CURL_INCLUDE_DIRS})
+ SET(CMAKE_CURL_LIBRARIES ${CURL_LIBRARIES})
+ELSE(CMAKE_USE_SYSTEM_CURL)
+ SET(CURL_SPECIAL_ZLIB_H ${CMAKE_ZLIB_HEADER})
+ SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
+ SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
+ SUBDIRS(Utilities/cmcurl)
+ SET(CMAKE_CURL_INCLUDES)
+ SET(CMAKE_CURL_LIBRARIES cmcurl)
+ENDIF(CMAKE_USE_SYSTEM_CURL)
#-----------------------------------------------------------------------------
# Build Tar library for CTest.
+SET(CMTAR_ZLIB_HEADER ${CMAKE_ZLIB_HEADER})
+SET(CMTAR_ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
+SET(CMTAR_ZLIB_INCLUDE_DIRS ${CMAKE_ZLIB_INCLUDES})
SUBDIRS(Utilities/cmtar)
-SET(CMAKE_TAR_INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmtar")
-SET(CMAKE_TAR_LIBRARIES "cmtar")
+SET(CMAKE_TAR_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmtar)
+SET(CMAKE_TAR_LIBRARIES cmtar)
#-----------------------------------------------------------------------------
# Build Compress library for CTest.
@@ -101,19 +190,33 @@
#-----------------------------------------------------------------------------
# Build expat library for CMake and CTest.
-SUBDIRS(Utilities/cmexpat)
-SET(CMAKE_EXPAT_INCLUDES
- "${CMAKE_CURRENT_BINARY_DIR}/Utilities"
- "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat"
- )
-SET(CMAKE_EXPAT_LIBRARIES "cmexpat")
+IF(CMAKE_USE_SYSTEM_EXPAT)
+ FIND_PACKAGE(EXPAT)
+ IF(NOT EXPAT_FOUND)
+ MESSAGE(FATAL_ERROR
+ "CMAKE_USE_SYSTEM_EXPAT is ON but a expat is not found!")
+ ENDIF(NOT EXPAT_FOUND)
+ SET(CMAKE_EXPAT_INCLUDES ${EXPAT_INCLUDE_DIRS})
+ SET(CMAKE_EXPAT_LIBRARIES ${EXPAT_LIBRARIES})
+ELSE(CMAKE_USE_SYSTEM_EXPAT)
+ SUBDIRS(Utilities/cmexpat)
+ SET(CMAKE_EXPAT_INCLUDES)
+ SET(CMAKE_EXPAT_LIBRARIES cmexpat)
+ENDIF(CMAKE_USE_SYSTEM_EXPAT)
-SUBDIRS(Utilities/cmxmlrpc)
-SET(CMAKE_XMLRPC_INCLUDES
- "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmxmlrpc"
- "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmxmlrpc"
- )
-SET(CMAKE_XMLRPC_LIBRARIES "cmXMLRPC")
+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)
+ SUBDIRS(Utilities/cmxmlrpc)
+ SET(CMAKE_XMLRPC_INCLUDES)
+ SET(CMAKE_XMLRPC_LIBRARIES cmXMLRPC)
+ENDIF(CMAKE_USE_SYSTEM_XMLRPC)
IF (UNIX)
FIND_PACKAGE(Curses QUIET)
Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.19
retrieving revision 1.1.8.20
diff -u -d -r1.1.8.19 -r1.1.8.20
--- ChangeLog.manual 13 Oct 2006 14:52:00 -0000 1.1.8.19
+++ ChangeLog.manual 27 Oct 2006 20:01:46 -0000 1.1.8.20
@@ -107,6 +107,52 @@
* better message if bogus generator is specified.
+* Better FindJava and FindJNI
+
+* Fix doxygen.config for CMake
+
+* add CPACK_MODULE_PATH
+
+* Fix configuration for ctest dashboard targets Experimental, Nightly, etc
+
+* Fix FindDoxygen for mac and app-bundles
+
+* Fix CPack simple install test with NSIS
+
+* Allow EXECUTE_PROCESS to strip trailing white space
+
+* Fix mingw echo in makefiles
+
+* Fix Xcode to not mess up -gdwarf-2
+
+* Fix crash when "linking" to custom targets.
+
+* Allow HEADER_FILE_ONLY to not compile the file in VS 7 and 8
+
+* Fix mingw out of binary with spaces in the path.
+
+* Fix for sudo make install (partial)
+
+* Allow installed zlib, curl, expat, xmlrpc to be used.
+
+* Add CMakeDependentOption.cmake module
+
+* Allow projects to set install prefix default
+
+* improved Find/Use wxWidgets
+
+* add support for windows dll version numbers
+
+* Fix message for -G when generator does not exist
+
+* Fix html references in help
+
+* Fix version on .exe cygwin
+
+* allow global timeout in ctest
+
+* Fix some odd cases with custom commands in VS 6
+
Changes in CMake 2.4.3
* fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler
Index: doxygen.config
===================================================================
RCS file: /cvsroot/CMake/CMake/doxygen.config,v
retrieving revision 1.1
retrieving revision 1.1.22.1
diff -u -d -r1.1 -r1.1.22.1
--- doxygen.config 11 Jan 2001 21:19:55 -0000 1.1
+++ doxygen.config 27 Oct 2006 20:01:46 -0000 1.1.22.1
@@ -236,7 +236,7 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = "d:\Insight\CMake\Source"
+INPUT = "Source"
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
More information about the Cmake-commits
mailing list