[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7320-g1ceedbf
Brad King
brad.king at kitware.com
Wed Jan 29 09:47:37 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 1ceedbf678e7d4c083f53da4e79e2f58226cc84e (commit)
via d366d314e7c2f759215cc89aa80a5f5500418eff (commit)
from f481c002b0a6527555004f547b62491cc3dcc0bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ceedbf678e7d4c083f53da4e79e2f58226cc84e
commit 1ceedbf678e7d4c083f53da4e79e2f58226cc84e
Merge: f481c00 d366d31
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 29 09:47:36 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 29 09:47:36 2014 -0500
Merge topic 'AddVersionToProjectCommand' into next
d366d314 Revert topic 'AddVersionToProjectCommand'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d366d314e7c2f759215cc89aa80a5f5500418eff
commit d366d314e7c2f759215cc89aa80a5f5500418eff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 29 09:47:06 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 29 09:47:06 2014 -0500
Revert topic 'AddVersionToProjectCommand'
It will be replaced by another implementation.
diff --git a/Help/command/project.rst b/Help/command/project.rst
index 5ecfcb1..9b9f93f 100644
--- a/Help/command/project.rst
+++ b/Help/command/project.rst
@@ -1,42 +1,15 @@
project
-------
-Set a name, version, and enable languages for the entire project.
+Set a name for the entire project.
-.. code-block:: cmake
+::
- project(<PROJECT-NAME>
- [VERSION <major>[.<minor>[.<patch>[.<tweak>]]]]
- [<language-name>...])
+ project(<projectname> [languageName1 languageName2 ... ] )
-Sets the name of the project and stores the name in the
-:variable:`PROJECT_NAME` variable. Additionally this sets variables
-
-* :variable:`PROJECT_SOURCE_DIR`,
- :variable:`<PROJECT-NAME>_SOURCE_DIR`
-* :variable:`PROJECT_BINARY_DIR`,
- :variable:`<PROJECT-NAME>_BINARY_DIR`
-
-If ``VERSION`` is specified, the components must be non-negative integers.
-The :command:`project()` command stores the version number and its components
-in variables
-
-* :variable:`PROJECT_VERSION`,
- :variable:`<PROJECT-NAME>_VERSION`
-* :variable:`PROJECT_VERSION_MAJOR`,
- :variable:`<PROJECT-NAME>_VERSION_MAJOR`
-* :variable:`PROJECT_VERSION_MINOR`,
- :variable:`<PROJECT-NAME>_VERSION_MINOR`
-* :variable:`PROJECT_VERSION_PATCH`,
- :variable:`<PROJECT-NAME>_VERSION_PATCH`
-* :variable:`PROJECT_VERSION_TWEAK`,
- :variable:`<PROJECT-NAME>_VERSION_TWEAK`
-
-If ``VERSION`` is not used, the :variable:`PROJECT_VERSION` variables will be
-unset if they have been set by a :command:`project(VERSION)` call before.
-(This can be disabled by setting the variable
-``CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND`` to ``FALSE`` before
-invoking the command.)
+Sets the name of the project. Additionally this sets the variables
+<projectName>_BINARY_DIR and <projectName>_SOURCE_DIR to the
+respective values.
Optionally you can specify which languages your project supports.
Example languages are CXX (i.e. C++), C, Fortran, etc. By default C
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 6467d66..aebfe87 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -78,17 +78,7 @@ Variables that Provide Information
/variable/PROJECT-NAME_BINARY_DIR
/variable/PROJECT_NAME
/variable/PROJECT-NAME_SOURCE_DIR
- /variable/PROJECT-NAME_VERSION
- /variable/PROJECT-NAME_VERSION_MAJOR
- /variable/PROJECT-NAME_VERSION_MINOR
- /variable/PROJECT-NAME_VERSION_PATCH
- /variable/PROJECT-NAME_VERSION_TWEAK
/variable/PROJECT_SOURCE_DIR
- /variable/PROJECT_VERSION
- /variable/PROJECT_VERSION_MAJOR
- /variable/PROJECT_VERSION_MINOR
- /variable/PROJECT_VERSION_PATCH
- /variable/PROJECT_VERSION_TWEAK
Variables that Change Behavior
==============================
diff --git a/Help/variable/PROJECT-NAME_BINARY_DIR.rst b/Help/variable/PROJECT-NAME_BINARY_DIR.rst
index 49bc558..a19940f 100644
--- a/Help/variable/PROJECT-NAME_BINARY_DIR.rst
+++ b/Help/variable/PROJECT-NAME_BINARY_DIR.rst
@@ -3,6 +3,6 @@
Top level binary directory for the named project.
-A variable is created with the name used in the :command:`project` command,
-and is the binary directory for the project. This can be useful when
-:command:`add_subdirectory` is used to connect several projects.
+A variable is created with the name used in the PROJECT command, and
+is the binary directory for the project. This can be useful when
+SUBDIR is used to connect several projects.
diff --git a/Help/variable/PROJECT-NAME_SOURCE_DIR.rst b/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
index 4df3e22..f2f5caf 100644
--- a/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
+++ b/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
@@ -3,6 +3,6 @@
Top level source directory for the named project.
-A variable is created with the name used in the :command:`project` command,
-and is the source directory for the project. This can be useful when
-:command:`add_subdirectory` is used to connect several projects.
+A variable is created with the name used in the PROJECT command, and
+is the source directory for the project. This can be useful when
+add_subdirectory is used to connect several projects.
diff --git a/Help/variable/PROJECT-NAME_VERSION.rst b/Help/variable/PROJECT-NAME_VERSION.rst
deleted file mode 100644
index 0f6ed51..0000000
--- a/Help/variable/PROJECT-NAME_VERSION.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-<PROJECT-NAME>_VERSION
-----------------------
-
-Value given to the ``VERSION`` option of the most recent call to the
-:command:`project` command with project name ``<PROJECT-NAME>``, if any.
-
-See also the component-wise version variables
-:variable:`<PROJECT-NAME>_VERSION_MAJOR`,
-:variable:`<PROJECT-NAME>_VERSION_MINOR`,
-:variable:`<PROJECT-NAME>_VERSION_PATCH`, and
-:variable:`<PROJECT-NAME>_VERSION_TWEAK`.
diff --git a/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst b/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
deleted file mode 100644
index 9e2d755..0000000
--- a/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-<PROJECT-NAME>_VERSION_MAJOR
-----------------------------
-
-First version number component of the :variable:`<PROJECT-NAME>_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT-NAME_VERSION_MINOR.rst b/Help/variable/PROJECT-NAME_VERSION_MINOR.rst
deleted file mode 100644
index fa2cdab..0000000
--- a/Help/variable/PROJECT-NAME_VERSION_MINOR.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-<PROJECT-NAME>_VERSION_MINOR
-----------------------------
-
-Second version number component of the :variable:`<PROJECT-NAME>_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT-NAME_VERSION_PATCH.rst b/Help/variable/PROJECT-NAME_VERSION_PATCH.rst
deleted file mode 100644
index 85b5e6b..0000000
--- a/Help/variable/PROJECT-NAME_VERSION_PATCH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-<PROJECT-NAME>_VERSION_PATCH
-----------------------------
-
-Third version number component of the :variable:`<PROJECT-NAME>_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst b/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
deleted file mode 100644
index 65c4044..0000000
--- a/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-<PROJECT-NAME>_VERSION_TWEAK
-----------------------------
-
-Fourth version number component of the :variable:`<PROJECT-NAME>_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT_BINARY_DIR.rst b/Help/variable/PROJECT_BINARY_DIR.rst
index 09e9ef2..e506bdd 100644
--- a/Help/variable/PROJECT_BINARY_DIR.rst
+++ b/Help/variable/PROJECT_BINARY_DIR.rst
@@ -3,4 +3,4 @@ PROJECT_BINARY_DIR
Full path to build directory for project.
-This is the binary directory of the most recent :command:`project` command.
+This is the binary directory of the most recent PROJECT command.
diff --git a/Help/variable/PROJECT_NAME.rst b/Help/variable/PROJECT_NAME.rst
index 61aa8bc..7559af6 100644
--- a/Help/variable/PROJECT_NAME.rst
+++ b/Help/variable/PROJECT_NAME.rst
@@ -3,4 +3,4 @@ PROJECT_NAME
Name of the project given to the project command.
-This is the name given to the most recent :command:`project` command.
+This is the name given to the most recent PROJECT command.
diff --git a/Help/variable/PROJECT_SOURCE_DIR.rst b/Help/variable/PROJECT_SOURCE_DIR.rst
index 27f2838..c9ba132 100644
--- a/Help/variable/PROJECT_SOURCE_DIR.rst
+++ b/Help/variable/PROJECT_SOURCE_DIR.rst
@@ -3,4 +3,4 @@ PROJECT_SOURCE_DIR
Top level source directory for the current project.
-This is the source directory of the most recent :command:`project` command.
+This is the source directory of the most recent PROJECT command.
diff --git a/Help/variable/PROJECT_VERSION.rst b/Help/variable/PROJECT_VERSION.rst
deleted file mode 100644
index 234558d..0000000
--- a/Help/variable/PROJECT_VERSION.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-PROJECT_VERSION
----------------
-
-Value given to the ``VERSION`` option of the most recent call to the
-:command:`project` command, if any.
-
-See also the component-wise version variables
-:variable:`PROJECT_VERSION_MAJOR`,
-:variable:`PROJECT_VERSION_MINOR`,
-:variable:`PROJECT_VERSION_PATCH`, and
-:variable:`PROJECT_VERSION_TWEAK`.
diff --git a/Help/variable/PROJECT_VERSION_MAJOR.rst b/Help/variable/PROJECT_VERSION_MAJOR.rst
deleted file mode 100644
index 4b6072c..0000000
--- a/Help/variable/PROJECT_VERSION_MAJOR.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-PROJECT_VERSION_MAJOR
----------------------
-
-First version number component of the :variable:`PROJECT_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT_VERSION_MINOR.rst b/Help/variable/PROJECT_VERSION_MINOR.rst
deleted file mode 100644
index 5f31220..0000000
--- a/Help/variable/PROJECT_VERSION_MINOR.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-PROJECT_VERSION_MINOR
----------------------
-
-Second version number component of the :variable:`PROJECT_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT_VERSION_PATCH.rst b/Help/variable/PROJECT_VERSION_PATCH.rst
deleted file mode 100644
index ac72ec0..0000000
--- a/Help/variable/PROJECT_VERSION_PATCH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-PROJECT_VERSION_PATCH
----------------------
-
-Third version number component of the :variable:`PROJECT_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Help/variable/PROJECT_VERSION_TWEAK.rst b/Help/variable/PROJECT_VERSION_TWEAK.rst
deleted file mode 100644
index d7f96d6..0000000
--- a/Help/variable/PROJECT_VERSION_TWEAK.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-PROJECT_VERSION_TWEAK
----------------------
-
-Fourth version number component of the :variable:`PROJECT_VERSION`
-variable as set by the :command:`project` command.
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 210fdb1..f388fe0 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -99,7 +99,7 @@
#
# ::
#
-# WRITE_BASIC_PACKAGE_VERSION_FILE( filename [VERSION major.minor.patch] COMPATIBILITY (AnyNewerVersion|SameMajorVersion|ExactVersion) )
+# WRITE_BASIC_PACKAGE_VERSION_FILE( filename VERSION major.minor.patch COMPATIBILITY (AnyNewerVersion|SameMajorVersion|ExactVersion) )
#
#
#
@@ -112,9 +112,6 @@
# filename is the output filename, it should be in the build tree.
# major.minor.patch is the version number of the project to be installed
#
-# If no VERSION is given, the version number specified via
-# project(... VERSION x.y.z ...) is used. If this hasn't been set, it errors
-# out.
# The COMPATIBILITY mode AnyNewerVersion means that the installed
# package version will be considered compatible if it is newer or
# exactly the same as the requested version. This mode should be used
diff --git a/Modules/WriteBasicConfigVersionFile.cmake b/Modules/WriteBasicConfigVersionFile.cmake
index 7d28e95..95187b4 100644
--- a/Modules/WriteBasicConfigVersionFile.cmake
+++ b/Modules/WriteBasicConfigVersionFile.cmake
@@ -6,7 +6,7 @@
#
# ::
#
-# WRITE_BASIC_CONFIG_VERSION_FILE( filename [VERSION major.minor.patch] COMPATIBILITY (AnyNewerVersion|SameMajorVersion) )
+# WRITE_BASIC_CONFIG_VERSION_FILE( filename VERSION major.minor.patch COMPATIBILITY (AnyNewerVersion|SameMajorVersion) )
#
#
#
@@ -46,11 +46,7 @@ function(WRITE_BASIC_CONFIG_VERSION_FILE _filename)
endif()
if("${CVF_VERSION}" STREQUAL "")
- if ("${PROJECT_VERSION}" STREQUAL "")
- message(FATAL_ERROR "No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE()")
- else()
- set(CVF_VERSION "${PROJECT_VERSION}")
- endif()
+ message(FATAL_ERROR "No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE()")
endif()
configure_file("${versionTemplateFile}" "${_filename}" @ONLY)
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 8a851e0..11f9a76 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -62,126 +62,16 @@ bool cmProjectCommand
"Value Computed by CMake", cmCacheManager::STATIC);
}
- bool haveVersion = false;
- std::string version;
std::vector<std::string> languages;
- bool doingVersion = false;
- for(size_t i =1; i < args.size(); ++i)
+ if(args.size() > 1)
{
- if (doingVersion)
+ for(size_t i =1; i < args.size(); ++i)
{
- doingVersion = false;
- haveVersion = true;
- version = args[i];
+ languages.push_back(args[i]);
}
- else
- {
- if (args[i] == "VERSION")
- {
- doingVersion = true;
- }
- else
- {
- languages.push_back(args[i]);
- }
- }
- }
-
- if (version.empty())
- {
- if (this->Makefile->IsOn("CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND"))
- {
- // unset these variables only if they have been set by a previous
- // project() call
- this->Makefile->RemoveDefinition("PROJECT_VERSION");
- this->Makefile->RemoveDefinition("PROJECT_VERSION_MAJOR");
- this->Makefile->RemoveDefinition("PROJECT_VERSION_MINOR");
- this->Makefile->RemoveDefinition("PROJECT_VERSION_PATCH");
- this->Makefile->RemoveDefinition("PROJECT_VERSION_TWEAK");
- }
-
- if (haveVersion)
- {
- // an empty version has been explicitely set
- std::string versionVar = args[0] + "_VERSION";
- this->Makefile->RemoveDefinition(versionVar.c_str());
- versionVar = args[0] + "_VERSION_MAJOR";
- this->Makefile->RemoveDefinition(versionVar.c_str());
- versionVar = args[0] + "_VERSION_MINOR";
- this->Makefile->RemoveDefinition(versionVar.c_str());
- versionVar = args[0] + "_VERSION_PATCH";
- this->Makefile->RemoveDefinition(versionVar.c_str());
- versionVar = args[0] + "_VERSION_TWEAK";
- this->Makefile->RemoveDefinition(versionVar.c_str());
- }
-
- this->Makefile->RemoveDefinition(
- "CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND");
}
else
{
- // A version was set, set the variables.
- unsigned int versionMajor = 0;
- unsigned int versionMinor = 0;
- unsigned int versionPatch = 0;
- unsigned int versionTweak= 0;
- int versionCount = sscanf(version.c_str(), "%u.%u.%u.%u",
- &versionMajor, &versionMinor,
- &versionPatch, &versionTweak);
-
- char buffer[1024];
- std::string versionVar;
- versionVar = args[0] + "_VERSION_TWEAK";
- sprintf(buffer, "%d", versionCount >=4 ? versionTweak : 0);
- this->Makefile->AddDefinition("PROJECT_VERSION_TWEAK", buffer);
- this->Makefile->AddDefinition(versionVar.c_str(), buffer);
-
- versionVar = args[0] + "_VERSION_PATCH";
- sprintf(buffer, "%d", versionCount >=3 ? versionPatch : 0);
- this->Makefile->AddDefinition("PROJECT_VERSION_PATCH", buffer);
- this->Makefile->AddDefinition(versionVar.c_str(), buffer);
-
- versionVar = args[0] + "_VERSION_MINOR";
- sprintf(buffer, "%d", versionCount >=2 ? versionMinor : 0);
- this->Makefile->AddDefinition("PROJECT_VERSION_MINOR", buffer);
- this->Makefile->AddDefinition(versionVar.c_str(), buffer);
-
- versionVar = args[0] + "_VERSION_MAJOR";
- sprintf(buffer, "%d", versionCount >=1 ? versionMajor : 0);
- this->Makefile->AddDefinition("PROJECT_VERSION_MAJOR", buffer);
- this->Makefile->AddDefinition(versionVar.c_str(), buffer);
-
- switch(versionCount)
- {
- case 4:
- sprintf(buffer, "%d.%d.%d.%d",
- versionMajor, versionMinor, versionPatch, versionTweak);
- break;
- case 3:
- sprintf(buffer, "%d.%d.%d", versionMajor, versionMinor, versionPatch);
- break;
- case 2:
- sprintf(buffer, "%d.%d", versionMajor, versionMinor);
- break;
- case 1:
- sprintf(buffer, "%d", versionMajor);
- break;
- case 0:
- sprintf(buffer, "0");
- break;
- }
-
- versionVar = args[0];
- versionVar += "_VERSION";
- this->Makefile->AddDefinition("PROJECT_VERSION", buffer);
- this->Makefile->AddDefinition(versionVar.c_str(), buffer);
-
- this->Makefile->AddDefinition(
- "CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND", "TRUE");
- }
-
- if (languages.size() == 0)
- {
// if no language is specified do c and c++
languages.push_back("C");
languages.push_back("CXX");
diff --git a/Tests/DoubleProject/CMakeLists.txt b/Tests/DoubleProject/CMakeLists.txt
index c9004eb..02a6275 100644
--- a/Tests/DoubleProject/CMakeLists.txt
+++ b/Tests/DoubleProject/CMakeLists.txt
@@ -1,56 +1,3 @@
project(dumb)
project(dumber)
add_executable(just_silly silly.c)
-
-if(DEFINED PROJECT_VERSION)
- message(SEND_ERROR "PROJECT_VERSION defined, but should not !")
-endif()
-
-project(Foo VERSION "1.2.3.4" C)
-
-if(NOT Foo_VERSION STREQUAL "1.2.3.4")
- message(SEND_ERROR "Foo_VERSION set to ${Foo_VERSION} ! (expected 1.2.3.4 !")
-endif()
-
-if(NOT "${Foo_VERSION_MAJOR}.${Foo_VERSION_MINOR}.${Foo_VERSION_PATCH}.${Foo_VERSION_TWEAK}" STREQUAL "1.2.3.4")
- message(SEND_ERROR "Foo_VERSION set to \"${Foo_VERSION_MAJOR}.${Foo_VERSION_MINOR}.${Foo_VERSION_PATCH}.${Foo_VERSION_TWEAK}\"! (expected 1.2.3.4 !")
-endif()
-
-if(NOT Foo_VERSION STREQUAL PROJECT_VERSION)
- message(SEND_ERROR "Foo_VERSION differs from PROJECT_VERSION ! (${Foo_VERSION} != ${PROJECT_VERSION})")
-endif()
-
-project(Bar CXX)
-
-if(DEFINED PROJECT_VERSION)
- message(SEND_ERROR "PROJECT_VERSION defined (\"${PROJECT_VERSION}\"), but should not !")
-endif()
-
-if(DEFINED Bar_VERSION)
- message(SEND_ERROR "Bar_VERSION defined, but should not !")
-endif()
-
-
-# test that PROJECT_VERSION is not reset if it hasn't been set by project(VERSION)
-
-set(PROJECT_VERSION "5.6.7")
-
-project(Blub)
-
-if(NOT "${PROJECT_VERSION}" STREQUAL "5.6.7")
- message(SEND_ERROR "PROJECT_VERSION unset, but should not have been unset since it wasn't set by project(VERSION) before.")
-endif()
-
-
-
-project(Xyz VERSION "7.8.9")
-
-set(CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND FALSE)
-
-set(PROJECT_VERSION "3.2.1")
-
-project(Abc)
-
-if(NOT "${PROJECT_VERSION}" STREQUAL "3.2.1")
- message(SEND_ERROR "PROJECT_VERSION set to \"${PROJECT_VERSION}\", but should still be 3.2.1, since unsetting was disabled .")
-endif()
-----------------------------------------------------------------------
Summary of changes:
Help/command/project.rst | 39 ++-------
Help/manual/cmake-variables.7.rst | 10 ---
Help/variable/PROJECT-NAME_BINARY_DIR.rst | 6 +-
Help/variable/PROJECT-NAME_SOURCE_DIR.rst | 6 +-
Help/variable/PROJECT-NAME_VERSION.rst | 11 ---
Help/variable/PROJECT-NAME_VERSION_MAJOR.rst | 5 --
Help/variable/PROJECT-NAME_VERSION_MINOR.rst | 5 --
Help/variable/PROJECT-NAME_VERSION_PATCH.rst | 5 --
Help/variable/PROJECT-NAME_VERSION_TWEAK.rst | 5 --
Help/variable/PROJECT_BINARY_DIR.rst | 2 +-
Help/variable/PROJECT_NAME.rst | 2 +-
Help/variable/PROJECT_SOURCE_DIR.rst | 2 +-
Help/variable/PROJECT_VERSION.rst | 11 ---
Help/variable/PROJECT_VERSION_MAJOR.rst | 5 --
Help/variable/PROJECT_VERSION_MINOR.rst | 5 --
Help/variable/PROJECT_VERSION_PATCH.rst | 5 --
Help/variable/PROJECT_VERSION_TWEAK.rst | 5 --
Modules/CMakePackageConfigHelpers.cmake | 5 +-
Modules/WriteBasicConfigVersionFile.cmake | 8 +-
Source/cmProjectCommand.cxx | 116 +-------------------------
Tests/DoubleProject/CMakeLists.txt | 53 ------------
21 files changed, 21 insertions(+), 290 deletions(-)
delete mode 100644 Help/variable/PROJECT-NAME_VERSION.rst
delete mode 100644 Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
delete mode 100644 Help/variable/PROJECT-NAME_VERSION_MINOR.rst
delete mode 100644 Help/variable/PROJECT-NAME_VERSION_PATCH.rst
delete mode 100644 Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
delete mode 100644 Help/variable/PROJECT_VERSION.rst
delete mode 100644 Help/variable/PROJECT_VERSION_MAJOR.rst
delete mode 100644 Help/variable/PROJECT_VERSION_MINOR.rst
delete mode 100644 Help/variable/PROJECT_VERSION_PATCH.rst
delete mode 100644 Help/variable/PROJECT_VERSION_TWEAK.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list