[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-444-gb1763e7

Brad King brad.king at kitware.com
Mon Mar 3 10:11:11 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  b1763e7384b59672f0dbdb63993de543a5ae6185 (commit)
       via  38df26bc6f0b36abaf673d0471037fb01ced39fa (commit)
      from  ca11593e236ad5453c55d48bdb457516c5518528 (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=b1763e7384b59672f0dbdb63993de543a5ae6185
commit b1763e7384b59672f0dbdb63993de543a5ae6185
Merge: ca11593 38df26b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 3 10:11:10 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 3 10:11:10 2014 -0500

    Merge topic 'CMP0043-dir-prop' into next
    
    38df26bc CMP0043: Document old and new interfaces for setting directory property.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38df26bc6f0b36abaf673d0471037fb01ced39fa
commit 38df26bc6f0b36abaf673d0471037fb01ced39fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 3 10:57:23 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 3 10:11:19 2014 -0500

    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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list