[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.158.2.9 1.158.2.10 CTestConfig.cmake 1.6.2.1 1.6.2.2 ChangeLog.manual 1.1.12.9 1.1.12.10
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:47:35 EST 2010
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv23913
Modified Files:
Tag: CMake-2-8
CMakeLists.txt CTestConfig.cmake ChangeLog.manual
Log Message:
CMake 2.8.1-rc1
Index: CTestConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestConfig.cmake,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** CTestConfig.cmake 1 Oct 2009 21:20:15 -0000 1.6.2.1
--- CTestConfig.cmake 28 Jan 2010 21:47:33 -0000 1.6.2.2
***************
*** 17,20 ****
--- 17,21 ----
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake")
set(CTEST_DROP_SITE_CDASH TRUE)
+ set(CTEST_CDASH_VERSION "1.4")
# use old trigger stuff so that cmake 2.4 and below will not
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.158.2.9
retrieving revision 1.158.2.10
diff -C 2 -d -r1.158.2.9 -r1.158.2.10
*** CMakeLists.txt 13 Nov 2009 14:07:09 -0000 1.158.2.9
--- CMakeLists.txt 28 Jan 2010 21:47:32 -0000 1.158.2.10
***************
*** 21,24 ****
--- 21,26 ----
SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
+ SET(CMake_BIN_DIR ${CMake_BINARY_DIR}/bin)
+
IF(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
# Since the built CMake will install itself instead of the
***************
*** 28,31 ****
--- 30,44 ----
ENDIF()
+ IF("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ # Disallow architecture-specific try_run. It may not run on the host.
+ MACRO(TRY_RUN)
+ IF(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ MESSAGE(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ ELSE()
+ _TRY_RUN(${ARGV})
+ ENDIF()
+ ENDMACRO()
+ ENDIF()
+
#-----------------------------------------------------------------------
# a macro to deal with system libraries, implemented as a macro
***************
*** 140,146 ****
# and not the ctest from the cmake building and testing
# cmake.
! SET(CMAKE_CTEST_COMMAND "${EXECUTABLE_OUTPUT_PATH}/ctest")
! SET(CMAKE_CMAKE_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cmake")
! SET(CMAKE_CPACK_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cpack")
ENDIF(BUILD_TESTING)
--- 153,159 ----
# and not the ctest from the cmake building and testing
# cmake.
! SET(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest")
! SET(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake")
! SET(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack")
ENDIF(BUILD_TESTING)
***************
*** 184,188 ****
SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
! SUBDIRS(Source/kwsys)
#---------------------------------------------------------------------
--- 197,201 ----
SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
! ADD_SUBDIRECTORY(Source/kwsys)
#---------------------------------------------------------------------
***************
*** 213,217 ****
SET(CMAKE_ZLIB_INCLUDES)
SET(CMAKE_ZLIB_LIBRARIES cmzlib)
! SUBDIRS(Utilities/cmzlib)
ENDIF(CMAKE_USE_SYSTEM_ZLIB)
--- 226,230 ----
SET(CMAKE_ZLIB_INCLUDES)
SET(CMAKE_ZLIB_LIBRARIES cmzlib)
! ADD_SUBDIRECTORY(Utilities/cmzlib)
ENDIF(CMAKE_USE_SYSTEM_ZLIB)
***************
*** 236,240 ****
SET(CMAKE_CURL_INCLUDES)
SET(CMAKE_CURL_LIBRARIES cmcurl)
! SUBDIRS(Utilities/cmcurl)
ENDIF(CMAKE_USE_SYSTEM_CURL)
--- 249,253 ----
SET(CMAKE_CURL_INCLUDES)
SET(CMAKE_CURL_LIBRARIES cmcurl)
! ADD_SUBDIRECTORY(Utilities/cmcurl)
ENDIF(CMAKE_USE_SYSTEM_CURL)
***************
*** 253,257 ****
"${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
! SUBDIRS(Utilities/cmcompress)
#---------------------------------------------------------------------
--- 266,270 ----
"${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
! ADD_SUBDIRECTORY(Utilities/cmcompress)
#---------------------------------------------------------------------
***************
*** 268,272 ****
SET(CMAKE_EXPAT_INCLUDES)
SET(CMAKE_EXPAT_LIBRARIES cmexpat)
! SUBDIRS(Utilities/cmexpat)
ENDIF(CMAKE_USE_SYSTEM_EXPAT)
--- 281,285 ----
SET(CMAKE_EXPAT_INCLUDES)
SET(CMAKE_EXPAT_LIBRARIES cmexpat)
! ADD_SUBDIRECTORY(Utilities/cmexpat)
ENDIF(CMAKE_USE_SYSTEM_EXPAT)
***************
*** 303,307 ****
ENDIF (UNIX)
IF(BUILD_CursesDialog)
! SUBDIRS(Source/CursesDialog/form)
ENDIF(BUILD_CursesDialog)
ENDMACRO (CMAKE_BUILD_UTILITIES)
--- 316,320 ----
ENDIF (UNIX)
IF(BUILD_CursesDialog)
! ADD_SUBDIRECTORY(Source/CursesDialog/form)
ENDIF(BUILD_CursesDialog)
ENDMACRO (CMAKE_BUILD_UTILITIES)
***************
*** 316,321 ****
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8)
! SET(CMake_VERSION_PATCH 0)
! #SET(CMake_VERSION_RC 8)
# We use odd minor numbers for development versions.
--- 329,334 ----
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8)
! SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 1)
# We use odd minor numbers for development versions.
***************
*** 335,345 ****
INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
# where to write the resulting executables and libraries
SET(BUILD_SHARED_LIBS OFF)
! SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/bin CACHE INTERNAL
! "Where to put the executables for CMake")
SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
"Where to put the libraries for CMake")
- INCLUDE_REGULAR_EXPRESSION("^.*$")
# The CMake executables usually do not need any rpath to run in the build or
--- 348,360 ----
INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+ # Set up test-time configuration.
+ SET_DIRECTORY_PROPERTIES(PROPERTIES
+ TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake")
+
# where to write the resulting executables and libraries
SET(BUILD_SHARED_LIBS OFF)
! SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.")
SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
"Where to put the libraries for CMake")
# The CMake executables usually do not need any rpath to run in the build or
***************
*** 357,360 ****
--- 372,379 ----
STRING(REGEX REPLACE "^/" "" CMake_DOC_DEST "${CMAKE_DOC_DIR}")
+ IF(BUILD_TESTING)
+ INCLUDE(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
+ ENDIF()
+
# include special compile flags for some compilers
INCLUDE(CompileFlags.cmake)
***************
*** 443,449 ****
# build the remaining subdirectories
! SUBDIRS(Source)
! SUBDIRS(Utilities)
! SUBDIRS(Tests)
# add a test
--- 462,468 ----
# build the remaining subdirectories
! ADD_SUBDIRECTORY(Source)
! ADD_SUBDIRECTORY(Utilities)
! ADD_SUBDIRECTORY(Tests)
# add a test
***************
*** 471,472 ****
--- 490,498 ----
# End of the main section of the CMakeLists file
#-----------------------------------------------------------------------
+
+ # As a special case when building CMake itself, CMake 2.8.0 and below
+ # look up EXECUTABLE_OUTPUT_PATH in the top-level CMakeLists.txt file
+ # to compute the location of the "cmake" executable. We set it here
+ # so that those CMake versions can find it. We wait until after all
+ # the add_subdirectory() calls to avoid affecting the subdirectories.
+ SET(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.12.9
retrieving revision 1.1.12.10
diff -C 2 -d -r1.1.12.9 -r1.1.12.10
*** ChangeLog.manual 13 Nov 2009 14:07:10 -0000 1.1.12.9
--- ChangeLog.manual 28 Jan 2010 21:47:33 -0000 1.1.12.10
***************
*** 1,2 ****
--- 1,60 ----
+ Changes in CMake 2.8.1 RC 1
+ - Add "NMake Makefiles JOM" generator
+ - Add PathScale compiler support
+ - Add per-configuration OUTPUT_DIRECTORY properties
+ - Add per-target OSX_ARCHITECTURES property
+ - check_type_size(): Handle mixed-size universal binaries
+ - CPack: Document Mac generators
+ - CPack: Improve RPM spec files
+ - Create CMAKE_FORCE_Fortran_COMPILER for cross-compiling
+ - CTest: Add --http1.0 command-line option
+ - CTest: Add --timeout command-line option
+ - CTest: Do not munge UTF-8 output in XML files
+ - CTest: Document CTEST_USE_LAUNCHERS option
+ - CTest: Fix killing of whole test process trees
+ - CTest: Handle failure of running invalid executables
+ - CTest: Honor the -C arg to ctest (#2336)
+ - CTest: Improve host system introspection
+ - CTest: Optionally randomize test order (--schedule-random)
+ - CTest: Skip tests with unsatisfied REQUIRED_FILES test property
+ - CTest: Submit arbitrary results with ATTACHED_FILES test property
+ - ctest_build(): Enhance signature
+ - ctest_start(): Add APPEND option
+ - ctest_start(): Move CTEST_CHECKOUT_COMMAND from ctest_update
+ - ctest_update(): Submit global tree revision in Update.xml
+ - Cygwin: Do not export all symbols from DLLs (#10122)
+ - Cygwin: Name DLLs with SOVERSION, not VERSION (#10122)
+ - Detect 32/64-bit Windows with Intel compiler
+ - Eclipse generator enhancements
+ - ExternalProject: Add TIMEOUT parameter
+ - FindCUDA: Respect CUDA version differences
+ - FindCURL: Find import libraries on Windows
+ - FindDCMTK: Look in more places
+ - FindGTest: Handle spaces better (#10065)
+ - FindGTK2: Look in fink locations on Mac OS X
+ - FindHDF5: Follow find-module API conventions
+ - FindJava: Support for versioned find
+ - FindJNI: Honor find_package() REQUIRED and QUIET options
+ - FindMPI: Improve Windows support
+ - FindOpenSSL: Fix MinGW support
+ - FindPythonLibs: Look in config for static library
+ - FindQt4: Misc enhancements, sync with KDE vesion
+ - FindRuby: Fix version convention on Windows
+ - FindX11: Improve documentation
+ - Fortran: Detect address size (#10119)
+ - FortranCInterface: Honor user flags
+ - Improve VS 2010 beta2 support
+ - link_directories(): Treat relative paths consistently (CMP0015)
+ - Modernize FindLibXslt and FindLibXml.cmake
+ - Refactor platform info to simplify adding new compilers
+ - Support cross-compiling versioned DLLs
+ - UseQt4: Provide dependencies only for static Qt (#10021)
+ - Address issues:
+ #2336, #3571, #5041, #7541, #8725, #9011, #9042, #9054, #9163,
+ #9171, #9450, #9697, #9764, #9782, #9792, #9862, #9894, #9913,
+ #9916, #9917, #9918, #9949, #9965, #9970, #9982, #9985, #10003,
+ #10014, #10021, #10032, #10055, #10060, #10065, #10114, #10119,
+ #10122, #10126, #10136.
+
Changes in CMake 2.8.0 Release
- CPack: Honor CPACK_NSIS_DISPLAY_NAME (fixes regression)
More information about the Cmake-commits
mailing list