[Cmake-commits] CMake branch, next, updated. v3.5.2-969-g69b7868
Alexander Neundorf
neundorf at kde.org
Sun Apr 17 15:41:39 EDT 2016
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 69b7868da554b594849d5c3d89839ee54d659cd8 (commit)
via 6e3259705146a62693eef1a7617ebabcc9ac4fa6 (commit)
via 6f139d31cad75a25c1421b84d5d034cc72081205 (commit)
via 94179ecf22a819e3f9ae32c9e865c483202b9818 (commit)
from 2a0451e7f129aa27b824741cb7db3a9e3706b1a7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69b7868da554b594849d5c3d89839ee54d659cd8
commit 69b7868da554b594849d5c3d89839ee54d659cd8
Merge: 2a0451e 6e32597
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Apr 17 15:41:37 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 17 15:41:37 2016 -0400
Merge topic 'AddDocumentationForEclipseVariables' into next
6e325970 Add documentation for Eclipse-generator related variables. #15827
6f139d31 CMake Nightly Date Stamp
94179ecf CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e3259705146a62693eef1a7617ebabcc9ac4fa6
commit 6e3259705146a62693eef1a7617ebabcc9ac4fa6
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Apr 17 21:38:45 2016 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Apr 17 21:38:45 2016 +0200
Add documentation for Eclipse-generator related variables. #15827
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 7cf3a3d..3e04763 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -116,6 +116,10 @@ Variables that Change Behavior
/variable/CMAKE_DEBUG_TARGET_PROPERTIES
/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY
/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName
+ /variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
+ /variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
+ /variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS
+ /variable/CMAKE_ECLIPSE_VERSION
/variable/CMAKE_ERROR_DEPRECATED
/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
/variable/CMAKE_EXPORT_COMPILE_COMMANDS
diff --git a/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst b/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
new file mode 100644
index 0000000..331aae8
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
@@ -0,0 +1,10 @@
+CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
+---------------------------------------
+
+This cache variable is used by the Eclipse project generator. See
+:manual:`cmake-generators(7)`.
+
+The Eclipse project generator generates so-called linked resources
+e.g. to the subproject root dirs in the source tree or to the source files
+of targets.
+This can be disabled by setting this variable to FALSE.
diff --git a/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst b/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
new file mode 100644
index 0000000..7b4367d
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
@@ -0,0 +1,11 @@
+CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
+-------------------------------------
+
+This cache variable is used by the Eclipse project generator. See
+:manual:`cmake-generators(7)`.
+
+If this variable is set to TRUE, the Eclipse project generator will generate
+an Eclipse project in :variable:`CMAKE_SOURCE_DIR` . This project can then
+be used in Eclipse e.g. for the version control functionality.
+:variable:`CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT` defaults to FALSE; so
+nothing is written into the source directory.
diff --git a/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst b/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
new file mode 100644
index 0000000..6e8a408
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
@@ -0,0 +1,9 @@
+CMAKE_ECLIPSE_MAKE_ARGUMENTS
+----------------------------
+
+This cache variable is used by the Eclipse project generator. See
+:manual:`cmake-generators(7)`.
+
+This variable holds arguments which are used when Eclipse invokes the make
+tool. By default it is initialized to hold flags to enable parallel builds
+(using -j typically).
diff --git a/Help/variable/CMAKE_ECLIPSE_VERSION.rst b/Help/variable/CMAKE_ECLIPSE_VERSION.rst
new file mode 100644
index 0000000..8cc7882
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_VERSION.rst
@@ -0,0 +1,10 @@
+CMAKE_ECLIPSE_VERSION
+---------------------
+
+This cache variable is used by the Eclipse project generator. See
+:manual:`cmake-generators(7)`.
+
+When using the Eclipse project generator, CMake tries to find the Eclipse
+executable and detect the version of it. Depending on the version it finds,
+some features are enabled or disabled. If CMake doesn't find
+Eclipse, it assumes the oldest supported version, Eclipse Callisto (3.2).
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 4 ++++
Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst | 10 ++++++++++
Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst | 11 +++++++++++
Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst | 9 +++++++++
Help/variable/CMAKE_ECLIPSE_VERSION.rst | 10 ++++++++++
Source/CMakeVersion.cmake | 2 +-
6 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
create mode 100644 Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
create mode 100644 Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
create mode 100644 Help/variable/CMAKE_ECLIPSE_VERSION.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list