[Cmake-commits] [cmake-commits] hoffman committed CMakeCPack.cmake 1.14 1.14.2.1 CMakeLists.txt 1.158.2.2 1.158.2.3 CTestConfig.cmake 1.6 1.6.2.1 CTestCustom.cmake.in 1.8 1.8.2.1 ChangeLog.manual 1.1.12.2 1.1.12.3 CompileFlags.cmake 1.3 1.3.2.1 Copyright.txt 1.3 1.3.12.1 DartConfig.cmake 1.30 1.30.2.1 Readme.txt 1.4 1.4.2.1 bootstrap 1.125 1.125.2.1 configure 1.38 1.38.24.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 1 17:20:17 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv11203
Modified Files:
Tag: CMake-2-8
CMakeCPack.cmake CMakeLists.txt CTestConfig.cmake
CTestCustom.cmake.in ChangeLog.manual CompileFlags.cmake
Copyright.txt DartConfig.cmake Readme.txt bootstrap configure
Log Message:
Merge in changes to CMake-2-8 RC 2
Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C 2 -d -r1.14 -r1.14.2.1
*** CMakeCPack.cmake 5 Mar 2009 20:17:06 -0000 1.14
--- CMakeCPack.cmake 1 Oct 2009 21:20:15 -0000 1.14.2.1
***************
*** 1,6 ****
# If the cmake version includes cpack, use it
IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
IF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
- SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
OPTION(CMAKE_INSTALL_DEBUG_LIBRARIES
"Install Microsoft runtime debug libraries with CMake." FALSE)
--- 1,17 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
+
# If the cmake version includes cpack, use it
IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
IF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
OPTION(CMAKE_INSTALL_DEBUG_LIBRARIES
"Install Microsoft runtime debug libraries with CMake." FALSE)
Index: CTestConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestConfig.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** CTestConfig.cmake 9 Sep 2008 17:01:46 -0000 1.6
--- CTestConfig.cmake 1 Oct 2009 21:20:15 -0000 1.6.2.1
***************
*** 1,2 ****
--- 1,13 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
set(CTEST_PROJECT_NAME "CMake")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
Index: configure
===================================================================
RCS file: /cvsroot/CMake/CMake/configure,v
retrieving revision 1.38
retrieving revision 1.38.24.1
diff -C 2 -d -r1.38 -r1.38.24.1
*** configure 23 Jun 2003 12:58:19 -0000 1.38
--- configure 1 Oct 2009 21:20:15 -0000 1.38.24.1
***************
*** 1,3 ****
! #! /bin/sh
! cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
exec "${cmake_source_dir}/bootstrap" "$@"
--- 1,3 ----
! #!/bin/sh
! cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
exec "${cmake_source_dir}/bootstrap" "$@"
Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.125
retrieving revision 1.125.2.1
diff -C 2 -d -r1.125 -r1.125.2.1
*** bootstrap 22 Sep 2009 20:12:40 -0000 1.125
--- bootstrap 1 Oct 2009 21:20:15 -0000 1.125.2.1
***************
*** 1,20 ****
#!/bin/sh
!
! #=========================================================================
! #
! # Program: CMake - Cross-Platform Makefile Generator
! # Module: $RCSfile$
! # Language: Bourne Shell
! # Date: $Date$
! # Version: $Revision$
! #
! # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
! # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
#
! # This software is distributed WITHOUT ANY WARRANTY; without even
! # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
! # PURPOSE. See the above copyright notices for more information.
#
! #=========================================================================
# Version number extraction function.
--- 1,14 ----
#!/bin/sh
! #=============================================================================
! # CMake - Cross Platform Makefile Generator
! # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
#
! # Distributed under the OSI-approved BSD License (the "License");
! # see accompanying file Copyright.txt for details.
#
! # This software is distributed WITHOUT ANY WARRANTY; without even the
! # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! # See the License for more information.
! #=============================================================================
# Version number extraction function.
***************
*** 35,40 ****
# Detect system and directory information.
cmake_system=`uname`
! cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
! cmake_source_dir=`(cd "${cmake_source_dir}";pwd)`
cmake_binary_dir=`pwd`
cmake_version_major="`cmake_version_component MAJOR`"
--- 29,33 ----
# Detect system and directory information.
cmake_system=`uname`
! cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd`
cmake_binary_dir=`pwd`
cmake_version_major="`cmake_version_component MAJOR`"
***************
*** 139,142 ****
--- 132,137 ----
cmake_default_prefix="c:/Program Files/CMake"
fi
+ elif ${cmake_system_haiku}; then
+ cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
else
cmake_default_prefix="/usr/local"
***************
*** 318,322 ****
cmake_version_display()
{
! echo "CMake ${cmake_version_full}, Copyright (c) 2000-2009 Kitware, Inc., Insight Consortium"
}
--- 313,317 ----
cmake_version_display()
{
! echo "CMake ${cmake_version_full}, Copyright 2000-2009 Kitware, Inc."
}
Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.12.2
retrieving revision 1.1.12.3
diff -C 2 -d -r1.1.12.2 -r1.1.12.3
*** ChangeLog.manual 25 Sep 2009 16:25:23 -0000 1.1.12.2
--- ChangeLog.manual 1 Oct 2009 21:20:15 -0000 1.1.12.3
***************
*** 1,2 ****
--- 1,51 ----
+ Changes in CMake 2.8.0 RC 2
+ - Fix FindQt4 so that QtHelp depends on QtNetwork
+ - Add missing copyright notice to CMake.cmake module
+ - Add alternative _UTILITY targets to all VS solutions
+ - FindGTest.cmake some bugfixes, also added public function for closer integration btwn GoogleTest & CTest, contributed by Dan Blezek.
+ - Eliminate ExternalProject's use of CMAKE_CFG_INTDIR subdir for Makefile generators. It was causing problems with parallel make -j invocations. Keep it for multi-configuration build systems so that Debug and Release stamp files remain separate.
+ - Fix for bug #9611, some more paths for OpenJDK.
+ - Fix get_filename_component() registry view with wow64
+ - Fix warnings in CMake source code.
+ - Fix module definition file reference for VS6 NMake
+ - Fix for bug #9611 do not hard code archs for search paths of java, look at the machine type.
+ - Fix bug#9619 add a link to module maintainers page in readme.txt for Modules
+ - Add cmake-help-command function to emacs-mode
+ - Add initial XL C compiler flags for safer builds
+ - Split XL compiler information files
+ - Fix default install prefix on Haiku
+ - Fix use of module .def files for MS tools
+ - Add StringProperty options includeing /def: for VS 10 flag table
+ - Convert copyright to OSI BSD and clean up licenses
+ - ENH: Added ctest test coverage for a test timeout
+ - CTest honors test timeouts again.
+ - Remove ctest_submit from CTestTestParallel
+ - Fix shared library creation flag for XL on Linux
+ - Fix BUG: 0009612: --output-on-failure option doesn't work with
+ the new parallel CTest handler
+ - Removed support for cutil library and header file.
+ - Fixed CUDA_PROPAGATE_HOST_FLAGS, added path for Mac SDK.
+ - Make sure LINK_FLAGS are seen by generator, fix for part of bug#9613
+ - Fix issue #9412 - remove RPATH from files copied by
+ BundleUtilities.cmake on Linux. Thank
+ - Fix support for OLD behavior of policy CMP0002
+ - Fix issue #8818 - escape quotes in the license file when using the
+ DragNDrop cpack genera
+ - Fix .vfproj file version for Intel Fortran 10.1
+ - Use BeAPI for per-user package registry on Haiku
+ - Correct comments and use ASM${ASM_DIALECT} env. var instead of ASM
+ env. var to initialize
+ - Fix bug #9529.
+ - Fix Windows GUI implib and image version in VS 6
+ - Convert newlines from CRLF to LF
+ - Oops. Last commit did not create subdir before doing a touch on a
+ file in it. So it fails of a type that is expected to have a
+ location...
+ - Policies 14 and 15 will be first released in 2.8.0
+ - Document full version number with policy default
+ - Simplify bootstrap script source dir detection
+ - Documentation fixes, new CUDA_PROPAGATE_HOST_FLAGS, changed output
+ directory.
+
Changes in CMake 2.8.0 RC 1
Index: DartConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/DartConfig.cmake,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C 2 -d -r1.30 -r1.30.2.1
*** DartConfig.cmake 21 Jul 2008 19:44:36 -0000 1.30
--- DartConfig.cmake 1 Oct 2009 21:20:15 -0000 1.30.2.1
***************
*** 1,2 ****
--- 1,13 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
set(CTEST_PROJECT_NAME "CMake")
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
Index: Copyright.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Copyright.txt,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -C 2 -d -r1.3 -r1.3.12.1
*** Copyright.txt 30 Apr 2006 00:03:33 -0000 1.3
--- Copyright.txt 1 Oct 2009 21:20:15 -0000 1.3.12.1
***************
*** 1,50 ****
! CMake was initially developed by Kitware with the following sponsorship:
! * National Library of Medicine at the National Institutes of Health
! as part of the Insight Segmentation and Registration Toolkit (ITK).
! * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
! Visualization Initiative.
! * National Alliance for Medical Image Computing (NAMIC) is funded by the
! National Institutes of Health through the NIH Roadmap for Medical Research,
! Grant U54 EB005149.
! * Kitware, Inc.
! The CMake copyright is as follows:
! Copyright (c) 2002 Kitware, Inc., Insight Consortium
! All rights reserved.
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions are
! met:
! * Redistributions of source code must retain the above copyright notice,
! this list of conditions and the following disclaimer.
! * Redistributions in binary form must reproduce the above copyright notice,
! this list of conditions and the following disclaimer in the documentation
! and/or other materials provided with the distribution.
! * The names of Kitware, Inc., the Insight Consortium, or the names of
! any consortium members, or of any contributors, may not be used to
! endorse or promote products derived from this software without
! specific prior written permission.
! * Modified source versions must be plainly marked as such, and must
! not be misrepresented as being the original software.
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
! ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
! ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
! SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
! CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! See also the CMake web site: http://www.cmake.org for more information.
--- 1,56 ----
! CMake - Cross Platform Makefile Generator
! Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
! All rights reserved.
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions
! are met:
! * Redistributions of source code must retain the above copyright
! notice, this list of conditions and the following disclaimer.
! * Redistributions in binary form must reproduce the above copyright
! notice, this list of conditions and the following disclaimer in the
! documentation and/or other materials provided with the distribution.
! * Neither the names of Kitware, Inc., the Insight Software Consortium,
! nor the names of their contributors may be used to endorse or promote
! products derived from this software without specific prior written
! permission.
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
! HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
! DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
! THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! ------------------------------------------------------------------------------
! The above copyright and license notice applies to distributions of
! CMake in source and binary form. Some source files contain additional
! notices of original copyright by their contributors; see each source
! for details. Third-party software packages supplied with CMake under
! compatible licenses provide their own copyright notices documented in
! corresponding subdirectories.
! ------------------------------------------------------------------------------
! CMake was initially developed by Kitware with the following sponsorship:
! * National Library of Medicine at the National Institutes of Health
! as part of the Insight Segmentation and Registration Toolkit (ITK).
! * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
! Visualization Initiative.
! * National Alliance for Medical Image Computing (NAMIC) is funded by the
! National Institutes of Health through the NIH Roadmap for Medical Research,
! Grant U54 EB005149.
! * Kitware, Inc.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.158.2.2
retrieving revision 1.158.2.3
diff -C 2 -d -r1.158.2.2 -r1.158.2.3
*** CMakeLists.txt 24 Sep 2009 20:01:33 -0000 1.158.2.2
--- CMakeLists.txt 1 Oct 2009 21:20:15 -0000 1.158.2.3
***************
*** 1,2 ****
--- 1,13 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
PROJECT(CMake)
***************
*** 171,174 ****
--- 182,186 ----
SET(KWSYS_USE_CommandLineArguments 1)
SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
+ SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
SUBDIRS(Source/kwsys)
***************
*** 304,308 ****
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 1)
# We use odd minor numbers for development versions.
--- 316,320 ----
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 2)
# We use odd minor numbers for development versions.
***************
*** 342,345 ****
--- 354,358 ----
MARK_AS_ADVANCED(CMAKE_DATA_DIR CMAKE_DOC_DIR CMAKE_MAN_DIR)
STRING(REGEX REPLACE "^/" "" CMake_DATA_DEST "${CMAKE_DATA_DIR}")
+ STRING(REGEX REPLACE "^/" "" CMake_DOC_DEST "${CMAKE_DOC_DIR}")
# include special compile flags for some compilers
***************
*** 437,440 ****
--- 450,456 ----
--system-information -G "${CMAKE_TEST_GENERATOR}" )
+ # Install license file as it requires.
+ INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST})
+
# Install script directories.
INSTALL(
Index: CTestCustom.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestCustom.cmake.in,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** CTestCustom.cmake.in 10 Jul 2009 13:53:50 -0000 1.8
--- CTestCustom.cmake.in 1 Oct 2009 21:20:15 -0000 1.8.2.1
***************
*** 25,28 ****
--- 25,29 ----
"remark\\(1209"
"stl_deque.h:1051"
+ "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)"
"Parser.cxx.*warning.*2111-D.*statement is unreachable"
"CMakeSetupManifest.xml.*manifest authoring warning.*Unrecognized Element"
Index: CompileFlags.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CompileFlags.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** CompileFlags.cmake 25 Jun 2009 20:41:54 -0000 1.3
--- CompileFlags.cmake 1 Oct 2009 21:20:15 -0000 1.3.2.1
***************
*** 1,2 ****
--- 1,14 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
+
#-----------------------------------------------------------------------------
# set some special flags for different compilers
Index: Readme.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Readme.txt,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** Readme.txt 12 May 2009 19:06:53 -0000 1.4
--- Readme.txt 1 Oct 2009 21:20:15 -0000 1.4.2.1
***************
*** 1,4 ****
This is CMake, the cross-platform, open-source make system.
! CMake is free software under a BSD-like license, see Copyright.txt.
For documentation see the Docs/ directory once you have built CMake
or visit http://www.cmake.org.
--- 1,4 ----
This is CMake, the cross-platform, open-source make system.
! CMake is distributed under the BSD License, see Copyright.txt.
For documentation see the Docs/ directory once you have built CMake
or visit http://www.cmake.org.
More information about the Cmake-commits
mailing list