[Cmake-commits] CMake branch, master, updated. v3.11.1-670-g4ac4823
Kitware Robot
kwrobot at kitware.com
Tue May 1 11:35:05 EDT 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 4ac48237a0337a6d36556e0424e44baef38cad9a (commit)
via 1155f96dd911d7a46aea2160eaebc3653d93a852 (commit)
via 052743556bffee09bd4d3d8631ac6103482cc359 (commit)
via b3baa97e80af96eaeb7d0599e2d00071a945f7b8 (commit)
from 6f0cd64f897d57c6e2afe8163345e9bb8dec1fec (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=4ac48237a0337a6d36556e0424e44baef38cad9a
commit 4ac48237a0337a6d36556e0424e44baef38cad9a
Merge: 1155f96 b3baa97
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 1 15:32:32 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 1 11:32:59 2018 -0400
Merge topic 'source_group-empty-prefix'
b3baa97e80 Source_Group: Allow an empty prefix with the TREE syntax.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2022
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1155f96dd911d7a46aea2160eaebc3653d93a852
commit 1155f96dd911d7a46aea2160eaebc3653d93a852
Merge: 6f0cd64 0527435
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 1 15:32:22 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 1 11:32:29 2018 -0400
Merge topic 'doc-wiki-links'
052743556b Modules: Update documented links to CMake community Wiki
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2023
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=052743556bffee09bd4d3d8631ac6103482cc359
commit 052743556bffee09bd4d3d8631ac6103482cc359
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 15:34:50 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 30 15:34:50 2018 -0400
Modules: Update documented links to CMake community Wiki
The wiki has moved. Update links to reference the new pages.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 444f632..067e290 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -29,8 +29,8 @@
# Here are some CPackDeb wiki resources that are here for historic reasons and
# are no longer maintained but may still prove useful:
#
-# - https://cmake.org/Wiki/CMake:CPackConfiguration
-# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29
+# - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/Configuration
+# - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/PackageGenerators#deb-unix-only
#
# List of CPackDEB specific variables:
#
@@ -278,7 +278,7 @@
# You may need set :variable:`CMAKE_INSTALL_RPATH` to an appropriate value
# if you use this feature, because if you don't :code:`dpkg-shlibdeps`
# may fail to find your own shared libs.
-# See https://cmake.org/Wiki/CMake_RPATH_handling.
+# See https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DEBUG
#
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 87385de..8d8eab3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -40,8 +40,8 @@
# Here are some CPackRPM wiki resources that are here for historic reasons and
# are no longer maintained but may still prove useful:
#
-# - https://cmake.org/Wiki/CMake:CPackConfiguration
-# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
+# - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/Configuration
+# - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/PackageGenerators#rpm-unix-only
#
# List of CPackRPM specific variables:
#
diff --git a/Modules/readme.txt b/Modules/readme.txt
index 1e0c13b..a629478 100644
--- a/Modules/readme.txt
+++ b/Modules/readme.txt
@@ -1,4 +1,4 @@
See the "Find Modules" section of the cmake-developer(7) manual page.
For more information about how to contribute modules to CMake, see this page:
-https://cmake.org/Wiki/CMake:Module_Maintainers
+https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/dev/Module-Maintainers
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 9b9ef60..7190c36 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -252,9 +252,7 @@ class cmMakefile;
/** \class cmPolicies
* \brief Handles changes in CMake behavior and policies
*
- * See the cmake wiki section on
- * <a href="https://cmake.org/Wiki/CMake/Policies">policies</a>
- * for an overview of this class's purpose
+ * See the cmake-policies(7) manual for an overview of this class's purpose.
*/
class cmPolicies
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3baa97e80af96eaeb7d0599e2d00071a945f7b8
commit b3baa97e80af96eaeb7d0599e2d00071a945f7b8
Author: Yohann Benedic <yohann at de2600.ispfr.net>
AuthorDate: Mon Apr 30 14:19:11 2018 +0200
Commit: Yohann Benedic <yohann at de2600.ispfr.net>
CommitDate: Mon Apr 30 16:44:08 2018 +0200
Source_Group: Allow an empty prefix with the TREE syntax.
When calling
source_group(TREE <root> PREFIX "" FILES ...)
the files located at the root directory were not assigned
to the correct source group: they were put in a default
group (e.g. "Source Files" in Visual Studio).
Fixes: #17608
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 8c9b63c..c3df313 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -101,9 +101,13 @@ bool addFilesToItsSourceGroups(const std::string& root,
tokenizedPath = tokenizePath(sgFilesPath);
}
- if (tokenizedPath.size() > 1) {
+ if (!tokenizedPath.empty()) {
tokenizedPath.pop_back();
+ if (tokenizedPath.empty()) {
+ tokenizedPath.push_back("");
+ }
+
sg = makefile.GetOrCreateSourceGroup(tokenizedPath);
if (!sg) {
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 6 +++---
Modules/CPackRPM.cmake | 4 ++--
Modules/readme.txt | 2 +-
Source/cmPolicies.h | 4 +---
Source/cmSourceGroupCommand.cxx | 6 +++++-
5 files changed, 12 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list