[Cmake-commits] CMake branch, master, updated. v3.8.0-786-g89310b0
Kitware Robot
kwrobot at kitware.com
Wed Apr 19 10:45:07 EDT 2017
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 89310b0b2025c0ceee7a3e6c50da88b6e2cf92ca (commit)
via 872d08ad348eba019e56c3eb7c1cc4929c417eba (commit)
via 3022545f14a38d07105de0555c75e445c5b587a6 (commit)
via 86787633f8440fcb3bd3fd96018134a6c5157e9c (commit)
from 3d3144bb023a98392594038973576cfbf046c039 (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=89310b0b2025c0ceee7a3e6c50da88b6e2cf92ca
commit 89310b0b2025c0ceee7a3e6c50da88b6e2cf92ca
Merge: 872d08a 3022545
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 19 14:42:11 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Apr 19 10:43:21 2017 -0400
Merge topic 'doc-find-path-sep'
3022545f Help: Document find command search path separators
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !718
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=872d08ad348eba019e56c3eb7c1cc4929c417eba
commit 872d08ad348eba019e56c3eb7c1cc4929c417eba
Merge: 3d3144b 8678763
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 19 14:41:55 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Apr 19 10:42:10 2017 -0400
Merge topic 'cmake-gui-desktop-icon-wayland'
86787633 cmake-gui: Fix display of icon under Wayland.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !715
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3022545f14a38d07105de0555c75e445c5b587a6
commit 3022545f14a38d07105de0555c75e445c5b587a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:22:20 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 18 14:22:20 2017 -0400
Help: Document find command search path separators
The `find_*` commands read search paths from both CMake variables
and from environment variables. Document how multiple values in
these variables should be separated.
Fixes: #16800
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index bd4d295..2f27764 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -73,6 +73,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
1. Search paths specified in cmake-specific cache variables.
These are intended to be used on the command line with a ``-DVAR=value``.
+ The values are interpreted as :ref:`;-lists <CMake Language Lists>`.
This can be skipped if ``NO_CMAKE_PATH`` is passed.
* |CMAKE_PREFIX_PATH_XXX|
@@ -80,7 +81,9 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
* |CMAKE_XXX_MAC_PATH|
2. Search paths specified in cmake-specific environment variables.
- These are intended to be set in the user's shell configuration.
+ These are intended to be set in the user's shell configuration,
+ and therefore use the host's native path separator
+ (``;`` on Windows and ``:`` on UNIX).
This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed.
* |CMAKE_PREFIX_PATH_XXX|
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 2cb1e5f..60a77b8 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -251,6 +251,7 @@ enabled.
1. Search paths specified in cmake-specific cache variables. These
are intended to be used on the command line with a ``-DVAR=value``.
+ The values are interpreted as :ref:`;-lists <CMake Language Lists>`.
This can be skipped if ``NO_CMAKE_PATH`` is passed::
CMAKE_PREFIX_PATH
@@ -258,7 +259,9 @@ enabled.
CMAKE_APPBUNDLE_PATH
2. Search paths specified in cmake-specific environment variables.
- These are intended to be set in the user's shell configuration.
+ These are intended to be set in the user's shell configuration,
+ and therefore use the host's native path separator
+ (``;`` on Windows and ``:`` on UNIX).
This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed::
<package>_DIR
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86787633f8440fcb3bd3fd96018134a6c5157e9c
commit 86787633f8440fcb3bd3fd96018134a6c5157e9c
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Apr 17 16:44:06 2017 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Apr 17 16:48:25 2017 -0600
cmake-gui: Fix display of icon under Wayland.
Fixes: #16797
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 10fd718..2e11a8a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -198,7 +198,7 @@ if(UNIX AND NOT APPLE)
# install a desktop file so CMake appears in the application start menu
# with an icon
- install(FILES CMake.desktop
+ install(FILES cmake-gui.desktop
DESTINATION "${CMAKE_XDGDATA_DIR}/applications"
${COMPONENT})
install(FILES cmakecache.xml
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/cmake-gui.desktop
similarity index 100%
rename from Source/QtDialog/CMake.desktop
rename to Source/QtDialog/cmake-gui.desktop
-----------------------------------------------------------------------
Summary of changes:
Help/command/FIND_XXX.txt | 5 ++++-
Help/command/find_package.rst | 5 ++++-
Source/QtDialog/CMakeLists.txt | 2 +-
Source/QtDialog/{CMake.desktop => cmake-gui.desktop} | 0
4 files changed, 9 insertions(+), 3 deletions(-)
rename Source/QtDialog/{CMake.desktop => cmake-gui.desktop} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list