[Cmake-commits] CMake branch, master, updated. v3.13.0-rc3-405-gf370254
Kitware Robot
kwrobot at kitware.com
Mon Nov 12 16:33:04 EST 2018
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, master has been updated
via f3702546521cbc09f1180365e9389a0eef87831b (commit)
via 48849544135924f13f1dea5b05afe17889b91b04 (commit)
via 45fb82483cdcdfe154ad0be63ff5729a68eb9439 (commit)
via db984477e466761311b5e102e90793b3de27f9b5 (commit)
via 72d54f1c532035fd0040a38d24712777400a0aa1 (commit)
via e286627334b08b524d228beccd818ebc4a10f799 (commit)
via 36e9d2d12427fea463650aee4cf6fb16d3be324d (commit)
via 1c94129e98dfc9a56a3bb69e22f2b31cd1b9083e (commit)
via ff800a768c5e5bebdde05326644bfcb5f7fd0452 (commit)
via b93b3b55003d4f7467569320061ae8a2b536ae97 (commit)
from ddb967cca1a37501dcf3fbd6f64c2d3be1c0c82b (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=f3702546521cbc09f1180365e9389a0eef87831b
commit f3702546521cbc09f1180365e9389a0eef87831b
Merge: 4884954 36e9d2d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:31:47 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:31:53 2018 -0500
Merge topic 'DocumentationVTK'
36e9d2d124 Help: remove reference to inexistent file DocumentationVTK.cmake.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2597
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48849544135924f13f1dea5b05afe17889b91b04
commit 48849544135924f13f1dea5b05afe17889b91b04
Merge: 45fb824 b93b3b5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:28:31 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:31:03 2018 -0500
Merge topic 'CMakeAddFortranSubdirectory'
b93b3b5500 Help: better summary and xrefs for CMakeAddFortranSubdirectory
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2592
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45fb82483cdcdfe154ad0be63ff5729a68eb9439
commit 45fb82483cdcdfe154ad0be63ff5729a68eb9439
Merge: db98447 1c94129
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:27:52 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:29:56 2018 -0500
Merge topic 'CMakePrintHelpers'
1c94129e98 Help: correct macro -> function in CMakePrintHelpers
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2596
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db984477e466761311b5e102e90793b3de27f9b5
commit db984477e466761311b5e102e90793b3de27f9b5
Merge: 72d54f1 ff800a7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:26:58 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:28:30 2018 -0500
Merge topic 'deprecate-ParseArguments'
ff800a768c Help: move CMakeParseArguments to deprecated section
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2595
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d54f1c532035fd0040a38d24712777400a0aa1
commit 72d54f1c532035fd0040a38d24712777400a0aa1
Merge: ddb967c e286627
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:26:06 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:26:11 2018 -0500
Merge topic 'CPack-sections'
e286627334 Help: Insert section headers in CPack module
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2593
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e286627334b08b524d228beccd818ebc4a10f799
commit e286627334b08b524d228beccd818ebc4a10f799
Author: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
AuthorDate: Sun Nov 11 23:02:55 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 12 09:18:02 2018 -0500
Help: Insert section headers in CPack module
The one extant section header was confusing at least:
Not all the doc page is on Variables.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index f3e3423..ebce851 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -7,8 +7,8 @@ CPack
Build binary and source package installers.
-Variables common to all CPack generators
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Introduction
+^^^^^^^^^^^^
The CPack module generates binary and source installers in a variety of
formats using the cpack program. Inclusion of the CPack module adds
@@ -23,6 +23,9 @@ installers on macOS and Windows), CPack generates installers that
allow users to select individual application components to install.
See :module:`CPackComponent` module for further details.
+CPack generators
+^^^^^^^^^^^^^^^^
+
The :variable:`CPACK_GENERATOR` variable has different meanings in different
contexts. In a ``CMakeLists.txt`` file, :variable:`CPACK_GENERATOR` is a
*list of generators*: and when :manual:`cpack <cpack(1)>` is run with no other
@@ -57,6 +60,9 @@ This is the key: For each generator listed in :variable:`CPACK_GENERATOR` in
internally to *the one currently being used* and then include the
:variable:`CPACK_PROJECT_CONFIG_FILE`.
+Variables common to all CPack generators
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
Before including this CPack module in your ``CMakeLists.txt`` file, there
are a variety of variables that can be set to customize the resulting
installers. The most commonly-used variables are:
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36e9d2d12427fea463650aee4cf6fb16d3be324d
commit 36e9d2d12427fea463650aee4cf6fb16d3be324d
Author: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 14:27:41 2018 +0100
Commit: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 14:27:41 2018 +0100
Help: remove reference to inexistent file DocumentationVTK.cmake.
diff --git a/Modules/Documentation.cmake b/Modules/Documentation.cmake
index 229b8ab..aaf24f6 100644
--- a/Modules/Documentation.cmake
+++ b/Modules/Documentation.cmake
@@ -5,9 +5,7 @@
Documentation
-------------
-DocumentationVTK.cmake
-
-This file provides support for the VTK documentation framework. It
+This module provides support for the VTK documentation framework. It
relies on several tools (Doxygen, Perl, etc).
#]=======================================================================]
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c94129e98dfc9a56a3bb69e22f2b31cd1b9083e
commit 1c94129e98dfc9a56a3bb69e22f2b31cd1b9083e
Author: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
AuthorDate: Sun Nov 11 23:18:37 2018 +0100
Commit: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
CommitDate: Sun Nov 11 23:18:37 2018 +0100
Help: correct macro -> function in CMakePrintHelpers
and apply lower case throughout
diff --git a/Modules/CMakePrintHelpers.cmake b/Modules/CMakePrintHelpers.cmake
index d5bbb4f..1af0bb7 100644
--- a/Modules/CMakePrintHelpers.cmake
+++ b/Modules/CMakePrintHelpers.cmake
@@ -5,32 +5,33 @@
CMakePrintHelpers
-----------------
-Convenience macros for printing properties and variables, useful e.g. for debugging.
+Convenience functions for printing properties and variables, useful
+e.g. for debugging.
::
- CMAKE_PRINT_PROPERTIES([TARGETS target1 .. targetN]
+ cmake_print_properties([TARGETS target1 .. targetN]
[SOURCES source1 .. sourceN]
[DIRECTORIES dir1 .. dirN]
[TESTS test1 .. testN]
[CACHE_ENTRIES entry1 .. entryN]
PROPERTIES prop1 .. propN )
-This macro prints the values of the properties of the given targets,
+This function prints the values of the properties of the given targets,
source files, directories, tests or cache entries. Exactly one of the
scope keywords must be used. Example::
- cmake_print_properties(TARGETS foo bar PROPERTIES
- LOCATION INTERFACE_INCLUDE_DIRS)
+ cmake_print_properties(TARGETS foo bar PROPERTIES
+ LOCATION INTERFACE_INCLUDE_DIRS)
This will print the LOCATION and INTERFACE_INCLUDE_DIRS properties for
both targets foo and bar.
+::
+ cmake_print_variables(var1 var2 .. varN)
-CMAKE_PRINT_VARIABLES(var1 var2 .. varN)
-
-This macro will print the name of each variable followed by its value.
+This function will print the name of each variable followed by its value.
Example::
cmake_print_variables(CMAKE_C_COMPILER CMAKE_MAJOR_VERSION DOES_NOT_EXIST)
@@ -40,7 +41,7 @@ Gives::
-- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; DOES_NOT_EXIST=""
#]=======================================================================]
-function(CMAKE_PRINT_VARIABLES)
+function(cmake_print_variables)
set(msg "")
foreach(var ${ARGN})
if(msg)
@@ -52,7 +53,7 @@ function(CMAKE_PRINT_VARIABLES)
endfunction()
-function(CMAKE_PRINT_PROPERTIES )
+function(cmake_print_properties)
set(options )
set(oneValueArgs )
set(multiValueArgs TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES PROPERTIES )
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff800a768c5e5bebdde05326644bfcb5f7fd0452
commit ff800a768c5e5bebdde05326644bfcb5f7fd0452
Author: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
AuthorDate: Sun Nov 11 23:14:37 2018 +0100
Commit: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
CommitDate: Sun Nov 11 23:14:37 2018 +0100
Help: move CMakeParseArguments to deprecated section
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 95744df..266c7a1 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -48,7 +48,6 @@ These modules are loaded using the :command:`include` command.
/module/CMakeFindPackageMode
/module/CMakeGraphVizOptions
/module/CMakePackageConfigHelpers
- /module/CMakeParseArguments
/module/CMakePrintHelpers
/module/CMakePrintSystemInformation
/module/CMakePushCheckState
@@ -270,6 +269,7 @@ Deprecated Utility Modules
/module/CMakeDetermineVSServicePack
/module/CMakeExpandImportedTargets
/module/CMakeForceCompiler
+ /module/CMakeParseArguments
/module/TestCXXAcceptsFlag
/module/Use_wxWindows
/module/WriteBasicConfigVersionFile
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b93b3b55003d4f7467569320061ae8a2b536ae97
commit b93b3b55003d4f7467569320061ae8a2b536ae97
Author: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
AuthorDate: Sun Nov 11 22:57:13 2018 +0100
Commit: Joachim Wuttke (h) <j.wuttke at fz-juelich.de>
CommitDate: Sun Nov 11 22:57:13 2018 +0100
Help: better summary and xrefs for CMakeAddFortranSubdirectory
diff --git a/Modules/CMakeAddFortranSubdirectory.cmake b/Modules/CMakeAddFortranSubdirectory.cmake
index 2bb3128..50b2807 100644
--- a/Modules/CMakeAddFortranSubdirectory.cmake
+++ b/Modules/CMakeAddFortranSubdirectory.cmake
@@ -5,18 +5,18 @@
CMakeAddFortranSubdirectory
---------------------------
-Use MinGW gfortran from VS if a fortran compiler is not found.
+Add a fortran-only subdirectory, find a fortran compiler, and build.
-The 'add_fortran_subdirectory' function adds a subdirectory to a
-project that contains a fortran only sub-project. The module will
+The ``cmake_add_fortran_subdirectory`` function adds a subdirectory
+to a project that contains a fortran-only subproject. The module will
check the current compiler and see if it can support fortran. If no
fortran compiler is found and the compiler is MSVC, then this module
will find the MinGW gfortran. It will then use an external project to
build with the MinGW tools. It will also create imported targets for
the libraries created. This will only work if the fortran code is
-built into a dll, so BUILD_SHARED_LIBS is turned on in the project.
-In addition the CMAKE_GNUtoMS option is set to on, so that the MS .lib
-files are created. Usage is as follows:
+built into a dll, so :variable:`BUILD_SHARED_LIBS` is turned on in
+the project. In addition the :variable:`CMAKE_GNUtoMS` option is set
+to on, so that Microsoft .lib files are created. Usage is as follows:
::
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-modules.7.rst | 2 +-
Modules/CMakeAddFortranSubdirectory.cmake | 12 ++++++------
Modules/CMakePrintHelpers.cmake | 21 +++++++++++----------
Modules/CPack.cmake | 10 ++++++++--
Modules/Documentation.cmake | 4 +---
5 files changed, 27 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list