[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2437-gcac16dd
Stephen Kelly
steveire at gmail.com
Thu Apr 17 05:06:11 EDT 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 cac16dd76f57ecb89761921b0910645db4aefdc3 (commit)
via 692228e41821a1af1f904304984c7366ae2ca288 (commit)
via e5e9b8e9a33186c0684974a54507d07596d72a1b (commit)
from 6205cf72201ba68504816c45c7ad49bebbfa5fa6 (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=cac16dd76f57ecb89761921b0910645db4aefdc3
commit cac16dd76f57ecb89761921b0910645db4aefdc3
Merge: 6205cf7 692228e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 17 05:06:10 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 17 05:06:10 2014 -0400
Merge topic 'CMP0052-docs' into next
692228e4 Help: Link to cmake-buildsystem from CMP0052 docs.
e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=692228e41821a1af1f904304984c7366ae2ca288
commit 692228e41821a1af1f904304984c7366ae2ca288
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 17 11:05:20 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 17 11:05:20 2014 +0200
Help: Link to cmake-buildsystem from CMP0052 docs.
diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index f857f36..48cfc9c 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -10,6 +10,9 @@ the installation prefix. This makes the installation depend on the
existence of the source dir or binary dir, and the installation will be
broken if either are removed after installation.
+See :ref:`Include Directories and Usage Requirements` for more on
+specifying include directories for targets.
+
The OLD behavior for this policy is to export the content of the
:prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` with the source or binary
directory. The NEW behavior for this
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5e9b8e9a33186c0684974a54507d07596d72a1b
commit e5e9b8e9a33186c0684974a54507d07596d72a1b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 17 11:01:58 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 17 11:01:58 2014 +0200
Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 501b924..3e1f011 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -580,7 +580,17 @@ and the install-tree. The ``BUILD_INTERFACE`` and ``INSTALL_INTERFACE``
generator expressions can be used to describe separate usage requirements
based on the usage location. Relative paths are allowed within these
expressions, and are interpreted relative to the current source directory
-or the installation prefix, as appropriate.
+or the installation prefix, as appropriate:
+
+.. code-block:: cmake
+
+ add_library(ClimbingStats climbingstats.cpp)
+ target_include_directories(ClimbingStats INTERFACE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
+ $<INSTALL_INTERFACE:/absolute/path>
+ $<INSTALL_INTERFACE:relative/path>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/$<CONFIG>/generated>
+ )
Two convenience APIs are provided relating to include directories usage
requirements. The :variable:`CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE` variable
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-buildsystem.7.rst | 12 +++++++++++-
Help/policy/CMP0052.rst | 3 +++
2 files changed, 14 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list