[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.24 1.97.2.25
ChangeLog.manual 1.1.8.29 1.1.8.30 cmake_uninstall.cmake.in
1.1.6.1 1.1.6.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Feb 5 13:21:34 EST 2007
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv30870
Modified Files:
Tag: CMake-2-4
CMakeLists.txt ChangeLog.manual cmake_uninstall.cmake.in
Log Message:
ENH: merge in changes from branch
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.24
retrieving revision 1.97.2.25
diff -u -d -r1.97.2.24 -r1.97.2.25
--- CMakeLists.txt 10 Jan 2007 17:39:14 -0000 1.97.2.24
+++ CMakeLists.txt 5 Feb 2007 18:21:32 -0000 1.97.2.25
@@ -5,9 +5,9 @@
# The CMake version number.
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 4)
-SET(CMake_VERSION_PATCH 6)
+SET(CMake_VERSION_PATCH 7)
# for an actual release this should not be defined
-#SET(CMake_VERSION_RC 2)
+SET(CMake_VERSION_RC 1)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
@@ -390,9 +390,44 @@
SET(CPACK_SOURCE_STRIP_FILES "")
SET(CPACK_PACKAGE_EXECUTABLES "ccmake" "CMake")
ENDIF(WIN32 AND NOT UNIX)
+# cygwin specific packaging stuff
+ IF(CYGWIN)
+ SET(CPACK_PACKAGE_NAME cmake)
+ # setup the name of the package for cygwin cmake-2.4.3
+ SET(CPACK_PACKAGE_FILE_NAME
+ "${CPACK_PACKAGE_NAME}-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+ # the source has the same name as the binary
+ SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
+ # Create a cygwin version number in case there are changes for cygwin
+ # that are not reflected upstream in CMake
+ SET(CPACK_CYGWIN_PATCH_NUMBER 1)
+ # if we are on cygwin and have cpack, then force the
+ # doc, data and man dirs to conform to cygwin style directories
+ SET(CMAKE_DOC_DIR "/share/doc/${CPACK_PACKAGE_FILE_NAME}")
+ SET(CMAKE_DATA_DIR "/share/${CPACK_PACKAGE_FILE_NAME}")
+ SET(CMAKE_MAN_DIR "/share/man")
+ # let the user know we just forced these values
+ MESSAGE(STATUS "Setup for Cygwin packaging")
+ MESSAGE(STATUS "Override cache CMAKE_DOC_DIR = ${CMAKE_DOC_DIR}")
+ MESSAGE(STATUS "Override cache CMAKE_DATA_DIR = ${CMAKE_DATA_DIR}")
+ MESSAGE(STATUS "Override cache CMAKE_MAN_DIR = ${CMAKE_MAN_DIR}")
+ # These files are required by the cmCPackCygwinSourceGenerator and the files
+ # put into the release tar files.
+ SET(CPACK_CYGWIN_BUILD_SCRIPT
+ "${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .sh")
+ SET(CPACK_CYGWIN_PATCH_FILE
+ "${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .patch")
+ # include the sub directory for cygwin releases
+ SUBDIRS(Utilities/Release/Cygwin)
+ # when packaging source make sure the .build directory is not included
+ SET(CPACK_SOURCE_IGNORE_FILES
+ "/CVS/" "/\\\\.build/" "/\\\\.svn/" "\\\\.swp$" "\\\\.#" "/#" "~$")
+ ENDIF(CYGWIN)
+ # include CPack model once all variables are set
INCLUDE(CPack)
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+# configure the CTestScript.cmake file into the binary directory
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Templates/CTestScript.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
@ONLY IMMEDIATE)
Index: cmake_uninstall.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/cmake_uninstall.cmake.in,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- cmake_uninstall.cmake.in 30 Jun 2006 17:48:42 -0000 1.1.6.1
+++ cmake_uninstall.cmake.in 5 Feb 2007 18:21:32 -0000 1.1.6.2
@@ -5,18 +5,18 @@
FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
STRING(REGEX REPLACE "\n" ";" files "${files}")
FOREACH(file ${files})
- MESSAGE(STATUS "Uninstalling \"${file}\"")
- IF(EXISTS "${file}")
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
EXEC_PROGRAM(
- "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
OUTPUT_VARIABLE rm_out
RETURN_VALUE rm_retval
)
IF("${rm_retval}" STREQUAL 0)
ELSE("${rm_retval}" STREQUAL 0)
- MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
ENDIF("${rm_retval}" STREQUAL 0)
- ELSE(EXISTS "${file}")
- MESSAGE(STATUS "File \"${file}\" does not exist.")
- ENDIF(EXISTS "${file}")
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file)
Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.29
retrieving revision 1.1.8.30
diff -u -d -r1.1.8.29 -r1.1.8.30
--- ChangeLog.manual 3 Jan 2007 21:09:14 -0000 1.1.8.29
+++ ChangeLog.manual 5 Feb 2007 18:21:32 -0000 1.1.8.30
@@ -1,3 +1,23 @@
+Changes in CMake 2.4.7
+
+* Add support for cygwin setup packages to setup
+
+* Fix uninstall with DESTDIR
+
+* If COMPILE_FLAGS is changed on a target the object files will now recompile
+
+* Fix Bug 3512 - precompiled header flag mapping on VS.
+
+* Do not run custom commands with relative paths if the working directory is set.
+
+* Fix bugs 3277, 4341, 4341 make pdb files match the target name correctly
+
+* handle user set NODEFAULTLIB correctly in VS projects
+
+* Fix external project for VS 2005 service pack 1 GUID not set correctly
+
+* Fix Kdevelop problem where files could end up duplicated
+
Changes in CMake 2.4.6
* Remove svn test in ctestctest3
More information about the Cmake-commits
mailing list