[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-423-gbebe0e0
Stephen Kelly
steveire at gmail.com
Mon Mar 3 04:58:10 EST 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 bebe0e0ea25c469642e12396cd3e988a7c5b376f (commit)
via 412199f34d0e35b11ffc2eb541b6d49b7e5230c6 (commit)
from 777a8fa559476d05e22bb4cf1738c63ad02a621c (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=bebe0e0ea25c469642e12396cd3e988a7c5b376f
commit bebe0e0ea25c469642e12396cd3e988a7c5b376f
Merge: 777a8fa 412199f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 3 04:58:10 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 3 04:58:10 2014 -0500
Merge topic 'CMP0043-dir-prop' into next
412199f3 CMP0043: Document old and new interfaces for setting directory property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=412199f34d0e35b11ffc2eb541b6d49b7e5230c6
commit 412199f34d0e35b11ffc2eb541b6d49b7e5230c6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 3 10:57:23 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 3 10:57:23 2014 +0100
CMP0043: Document old and new interfaces for setting directory property.
diff --git a/Help/policy/CMP0043.rst b/Help/policy/CMP0043.rst
index 43d6df2..629e502 100644
--- a/Help/policy/CMP0043.rst
+++ b/Help/policy/CMP0043.rst
@@ -18,16 +18,22 @@ or via :command:`target_compile_definitions`:
.. code-block:: cmake
- # Old Interface:
+ # Old Interfaces:
set_property(TARGET tgt APPEND PROPERTY
COMPILE_DEFINITIONS_DEBUG DEBUG_MODE
)
+ set_property(DIRECTORY APPEND PROPERTY
+ COMPILE_DEFINITIONS_DEBUG DIR_DEBUG_MODE
+ )
# New Interfaces:
set_property(TARGET tgt APPEND PROPERTY
COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUG_MODE>
)
target_compile_definitions(tgt PRIVATE $<$<CONFIG:Debug>:DEBUG_MODE>)
+ set_property(DIRECTORY APPEND PROPERTY
+ COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DIR_DEBUG_MODE>
+ )
The OLD behavior for this policy is to consume the content of the suffixed
:prop_tgt:`COMPILE_DEFINITIONS_<CONFIG>` target property when generating the
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0043.rst | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list