[Cmake-commits] [cmake-commits] king committed CMakeCPack.cmake 1.14 1.15 CMakeLists.txt 1.161 1.162 CTestConfig.cmake 1.6 1.7 CompileFlags.cmake 1.3 1.4 Copyright.txt 1.3 1.4 DartConfig.cmake 1.30 1.31 Readme.txt 1.4 1.5 bootstrap 1.126 1.127
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Sep 28 11:41:55 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv9530
Modified Files:
CMakeCPack.cmake CMakeLists.txt CTestConfig.cmake
CompileFlags.cmake Copyright.txt DartConfig.cmake Readme.txt
bootstrap
Log Message:
Convert CMake to OSI-approved BSD License
This converts the CMake license to a pure 3-clause OSI-approved BSD
License. We drop the previous license clause requiring modified
versions to be plainly marked. We also update the CMake copyright to
cover the full development time range.
Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** CMakeCPack.cmake 5 Mar 2009 20:17:06 -0000 1.14
--- CMakeCPack.cmake 28 Sep 2009 15:41:50 -0000 1.15
***************
*** 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.
+ #=============================================================================
+
# If the cmake version includes cpack, use it
IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
Index: CTestConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestConfig.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** CTestConfig.cmake 9 Sep 2008 17:01:46 -0000 1.6
--- CTestConfig.cmake 28 Sep 2009 15:41:53 -0000 1.7
***************
*** 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: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.126
retrieving revision 1.127
diff -C 2 -d -r1.126 -r1.127
*** bootstrap 25 Sep 2009 14:48:24 -0000 1.126
--- bootstrap 28 Sep 2009 15:41:53 -0000 1.127
***************
*** 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.
***************
*** 317,321 ****
cmake_version_display()
{
! echo "CMake ${cmake_version_full}, Copyright (c) 2000-2009 Kitware, Inc., Insight Consortium"
}
--- 311,315 ----
cmake_version_display()
{
! echo "CMake ${cmake_version_full}, Copyright 2000-2009 Kitware, Inc."
}
Index: DartConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/DartConfig.cmake,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** DartConfig.cmake 21 Jul 2008 19:44:36 -0000 1.30
--- DartConfig.cmake 28 Sep 2009 15:41:53 -0000 1.31
***************
*** 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.4
diff -C 2 -d -r1.3 -r1.4
*** Copyright.txt 30 Apr 2006 00:03:33 -0000 1.3
--- Copyright.txt 28 Sep 2009 15:41:53 -0000 1.4
***************
*** 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.161
retrieving revision 1.162
diff -C 2 -d -r1.161 -r1.162
*** CMakeLists.txt 28 Sep 2009 15:36:53 -0000 1.161
--- CMakeLists.txt 28 Sep 2009 15:41:51 -0000 1.162
***************
*** 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)
Index: CompileFlags.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CompileFlags.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CompileFlags.cmake 25 Jun 2009 20:41:54 -0000 1.3
--- CompileFlags.cmake 28 Sep 2009 15:41:53 -0000 1.4
***************
*** 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.5
diff -C 2 -d -r1.4 -r1.5
*** Readme.txt 12 May 2009 19:06:53 -0000 1.4
--- Readme.txt 28 Sep 2009 15:41:53 -0000 1.5
***************
*** 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