kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release'

This commit is contained in:
Brad King 2014-02-19 09:30:28 -05:00
parent a7c956b867 7cbab17871
commit 38082dea2b
19 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeCPackOptions.cmake.in
View File

@ -58,13 +58,11 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
endif()
set(CPACK_PACKAGE_VERSION
"@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@.@CMake_VERSION_PATCH@")
"@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@")
# WIX installers require at most a 4 component version number, where
# each component is an integer between 0 and 65534 inclusive
set(tweak "@CMake_VERSION_TWEAK@")
if(tweak MATCHES "^[0-9]+$")
if(tweak GREATER 0 AND tweak LESS 65535)
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.${tweak}")
endif()
set(patch "@CMake_VERSION_PATCH@")
if(patch MATCHES "^[0-9]+$" AND patch LESS 65535)
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.${patch}")
endif()
endif()

14
Help/release/3.0.rst → Help/release/3.0.0.rst
View File

@ -1,5 +1,5 @@
CMake 3.0 Release Notes
***********************
CMake 3.0.0 Release Notes
*************************
.. only:: html
@ -39,7 +39,7 @@ Documentation Changes
- :manual:`cmake-toolchains(7)`
- :manual:`cmake-variables(7)`, replacing ``cmakevars(1)``
* Release notes for CMake 3.0 and above will now be included with
* Release notes for CMake 3.0.0 and above will now be included with
the html documentation.
New Features
@ -216,6 +216,9 @@ Modules
* A new :module:`FindLua` module has been added to support
:command:`find_package(Lua)` calls.
* The :module:`FindBoost` module learned a new ``Boost_NAMESPACE``
option to change the ``boost`` prefix on library names.
* The :module:`FindBoost` module learned to control search
for libraies with the ``g`` tag (for MS debug runtime) with
a new ``Boost_USE_DEBUG_RUNTIME`` option. It is ``ON`` by
@ -387,6 +390,11 @@ Deprecated and Removed Features
Other Changes
=============
* The version scheme was changed to use only two components for
the feature level instead of three. The third component will
now be used for bug-fix releases or the date of development versions.
See the :variable:`CMAKE_VERSION` variable documentation for details.
* The default install locations of CMake itself on Windows and
OS X no longer contain the CMake version number. This allows
for easy replacement without re-generating local build trees

7
Help/release/dev/0-sample-topic.rst
View File

@ -1,7 +0,0 @@
0-sample-topic
--------------
* This is a sample release note for the change in a topic.
Developers should add similar notes for each topic branch
making a noteworthy change. Each document should be named
and titled to match the topic name to avoid merge conflicts.

5
Help/release/dev/Boost_NAMESPACE.rst
View File

@ -1,5 +0,0 @@
Boost_NAMESPACE
---------------
* The :module:`FindBoost` module learned a new ``Boost_NAMESPACE``
option to change the ``boost`` prefix on library names.

4
Help/release/index.rst
View File

@ -5,12 +5,10 @@ CMake Release Notes
This file should include the adjacent "dev.txt" file
in development versions but not in release versions.
.. include:: dev.txt
Releases
========
.. toctree::
:maxdepth: 1
3.0 <3.0>
3.0.0 <3.0.0>

10
Help/variable/CMAKE_TWEAK_VERSION.rst
View File

@ -1,5 +1,11 @@
CMAKE_TWEAK_VERSION
-------------------
Fourth version number component of the :variable:`CMAKE_VERSION`
variable.
Defined to ``0`` for compatibility with code written for older
CMake versions that may have defined higher values.
.. note::
In CMake versions 2.8.2 through 2.8.12, this variable holds
the fourth version number component of the
:variable:`CMAKE_VERSION` variable.

19
Help/variable/CMAKE_VERSION.rst
View File

@ -1,24 +1,23 @@
CMAKE_VERSION
-------------
The CMake version string as up to four non-negative integer components
The CMake version string as three non-negative integer components
separated by ``.`` and possibly followed by ``-`` and other information.
The first three components represent the feature level and the fourth
The first two components represent the feature level and the third
component represents either a bug-fix level or development date.
Release versions and release candidate versions of CMake use the format::
<major>.<minor>.<patch>[.<tweak>][-rc<n>]
<major>.<minor>.<patch>[-rc<n>]
where the ``<tweak>`` component is less than ``20000000``. Development
where the ``<patch>`` component is less than ``20000000``. Development
versions of CMake use the format::
<major>.<minor>.<patch>.<date>[-<id>]
<major>.<minor>.<date>[-<id>]
where the ``<date>`` component is of format ``CCYYMMDD`` and ``<id>``
may contain arbitrary text. This represents development as of a
particular date following the ``<major>.<minor>.<patch>`` feature
release.
particular date following the ``<major>.<minor>`` feature release.
Individual component values are also available in variables:
@ -35,6 +34,12 @@ strings as floating-point numbers.
.. note::
CMake versions 2.8.2 through 2.8.12 used three components for the
feature level. Release versions represented the bug-fix level in a
fourth component, i.e. ``<major>.<minor>.<patch>[.<tweak>][-rc<n>]``.
Development versions represented the development date in the fourth
component, i.e. ``<major>.<minor>.<patch>.<date>[-<id>]``.
CMake versions prior to 2.8.2 used three components for the
feature level and had no bug-fix component. Release versions
used an even-valued second component, i.e.

2
Modules/FindGTK2.cmake
View File

@ -108,7 +108,7 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
# Version 1.6 (CMake 2.8.13)
# Version 1.6 (CMake 3.0)
# * Create targets for each library
# * Do not link libfreetype
# Version 1.5 (CMake 2.8.12)

8
Source/CMakeInstallDestinations.cmake
View File

@ -1,15 +1,15 @@
# Keep formatting here consistent with bootstrap script expectations.
if(BEOS)
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # HAIKU
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
set(CMAKE_MAN_DIR_DEFAULT "documentation/man") # HAIKU
set(CMAKE_DOC_DIR_DEFAULT "documentation/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # HAIKU
set(CMAKE_DOC_DIR_DEFAULT "documentation/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
elseif(CYGWIN)
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # CYGWIN
set(CMAKE_DOC_DIR_DEFAULT "share/doc/cmake-${CMake_VERSION}") # CYGWIN
set(CMAKE_MAN_DIR_DEFAULT "share/man") # CYGWIN
else()
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # OTHER
set(CMAKE_DOC_DIR_DEFAULT "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # OTHER
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # OTHER
set(CMAKE_DOC_DIR_DEFAULT "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # OTHER
set(CMAKE_MAN_DIR_DEFAULT "man") # OTHER
endif()

2
Source/CMakeVersion.bash
View File

@ -3,5 +3,5 @@
if test "x$1" = "x-f"; then shift ; n='*' ; else n='\{8\}' ; fi
if test "$#" -gt 0; then echo 1>&2 "usage: CMakeVersion.bash [-f]"; exit 1; fi
sed -i -e '
s/\(^set(CMake_VERSION_TWEAK\) [0-9]'"$n"'\(.*\)/\1 '"$(date +%Y%m%d)"'\2/
s/\(^set(CMake_VERSION_PATCH\) [0-9]'"$n"'\(.*\)/\1 '"$(date +%Y%m%d)"'\2/
' "${BASH_SOURCE%/*}/CMakeVersion.cmake"

9
Source/CMakeVersion.cmake
View File

@ -1,6 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 12)
set(CMake_VERSION_TWEAK 20140219)
#set(CMake_VERSION_RC 1)
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 0)
set(CMake_VERSION_PATCH 0)
set(CMake_VERSION_RC 1)

7
Source/CMakeVersionCompute.cmake
View File

@ -1,8 +1,8 @@
# Load version number components.
include(${CMake_SOURCE_DIR}/Source/CMakeVersion.cmake)
# Releases define a small tweak level.
if("${CMake_VERSION_TWEAK}" VERSION_LESS 20000000)
# Releases define a small patch level.
if("${CMake_VERSION_PATCH}" VERSION_LESS 20000000)
set(CMake_VERSION_IS_RELEASE 1)
set(CMake_VERSION_SOURCE "")
else()
@ -12,9 +12,6 @@ endif()
# Compute the full version string.
set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH})
if(${CMake_VERSION_TWEAK} GREATER 0)
set(CMake_VERSION ${CMake_VERSION}.${CMake_VERSION_TWEAK})
endif()
if(CMake_VERSION_RC)
set(CMake_VERSION ${CMake_VERSION}-rc${CMake_VERSION_RC})
endif()

2
Source/cmExportBuildFileGenerator.cxx
View File

@ -52,7 +52,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
}
if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
{
this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3, 0, 0));
this->GenerateRequiredCMakeVersion(os, "3.0.0");
}
}

13
Source/cmExportFileGenerator.h
View File

@ -21,14 +21,13 @@
#define STRINGIFY_HELPER(X) #X
#define STRINGIFY(X) STRINGIFY_HELPER(X)
#define DEVEL_CMAKE_VERSION(maj, min, patch) \
(CMake_VERSION_ENCODE(maj, min, patch) > \
CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \
CMake_VERSION_PATCH) \
) ? \
#define DEVEL_CMAKE_VERSION(major, minor) ( \
CMake_VERSION_ENCODE(major, minor, 0) > \
CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, 0) ? \
STRINGIFY(CMake_VERSION_MAJOR) "." STRINGIFY(CMake_VERSION_MINOR) "." \
STRINGIFY(CMake_VERSION_PATCH) "." STRINGIFY(CMake_VERSION_TWEAK) \
: #maj "." #min "." #patch
STRINGIFY(CMake_VERSION_PATCH) \
: #major "." #minor ".0" \
)
class cmTargetExport;

2
Source/cmExportInstallFileGenerator.cxx
View File

@ -176,7 +176,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
if (require3_0_0)
{
this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3, 0, 0));
this->GenerateRequiredCMakeVersion(os, "3.0.0");
}
else if (require2_8_12)
{

2
Source/cmVersion.cxx
View File

@ -16,7 +16,7 @@
unsigned int cmVersion::GetMajorVersion() { return CMake_VERSION_MAJOR; }
unsigned int cmVersion::GetMinorVersion() { return CMake_VERSION_MINOR; }
unsigned int cmVersion::GetPatchVersion() { return CMake_VERSION_PATCH; }
unsigned int cmVersion::GetTweakVersion() { return CMake_VERSION_TWEAK; }
unsigned int cmVersion::GetTweakVersion() { return 0; }
const char* cmVersion::GetCMakeVersion()
{

1
Source/cmVersionConfig.h.in
View File

@ -12,5 +12,4 @@
#define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
#define CMake_VERSION_TWEAK @CMake_VERSION_TWEAK@
#define CMake_VERSION "@CMake_VERSION@"

4
Source/cmVersionMacros.h
View File

@ -14,8 +14,8 @@
#include "cmVersionConfig.h"
#define CMake_VERSION_TWEAK_IS_RELEASE(tweak) ((tweak) < 20000000)
#if CMake_VERSION_TWEAK_IS_RELEASE(CMake_VERSION_TWEAK)
#define CMake_VERSION_PATCH_IS_RELEASE(patch) ((patch) < 20000000)
#if CMake_VERSION_PATCH_IS_RELEASE(CMake_VERSION_PATCH)
# define CMake_VERSION_IS_RELEASE 1
#endif

5
bootstrap
View File

@ -53,10 +53,6 @@ cmake_version_major="`cmake_version_component MAJOR`"
cmake_version_minor="`cmake_version_component MINOR`"
cmake_version_patch="`cmake_version_component PATCH`"
cmake_version="${cmake_version_major}.${cmake_version_minor}.${cmake_version_patch}"
cmake_version_tweak="`cmake_version_component TWEAK`"
if [ "$cmake_version_tweak" != "0" ]; then
cmake_version="${cmake_version}.${cmake_version_tweak}"
fi
cmake_version_rc="`cmake_version_component RC`"
if [ "$cmake_version_rc" != "" ]; then
cmake_version="${cmake_version}-rc${cmake_version_rc}"
@ -1464,7 +1460,6 @@ fi
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MAJOR ${cmake_version_major}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MINOR ${cmake_version_minor}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH ${cmake_version_patch}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_TWEAK ${cmake_version_tweak}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_ROOT_DIR \"${cmake_root_dir}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""