[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6698-geb39da4

[Brad King]

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  eb39da489ef8f1f663baba56f2efb8390a273e42 (commit)
       via  dc44146ab38c9d8da7880722d0a993fa52581df0 (commit)
      from  e397a53cb10fd9fe6e52890e17283370ca0bde35 (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=eb39da489ef8f1f663baba56f2efb8390a273e42
commit eb39da489ef8f1f663baba56f2efb8390a273e42
Merge: e397a53 dc44146
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 6 10:22:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 6 10:22:26 2014 -0500

    Merge topic 'cmake-buildsystem-manual' into next
    
    dc44146 Help: Fix wording in draft of cmake-buildsystem.7.rst


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc44146ab38c9d8da7880722d0a993fa52581df0
commit dc44146ab38c9d8da7880722d0a993fa52581df0
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Mon Jan 6 00:29:54 2014 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 6 10:21:11 2014 -0500

    Help: Fix wording in draft of cmake-buildsystem.7.rst

diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 2b11d38..be60ebb 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -424,7 +424,7 @@ the ``CONFIG`` generator expression.
       $<$<CONFIG:Debug>:DEBUG_BUILD>
   )
 
-The ``CONFIG`` parameter is compared case-insensitvely with the configuration
+The ``CONFIG`` parameter is compared case-insensitively with the configuration
 being built.  In the presence of :prop_tgt:`IMPORTED` targets, the content of
 :prop_tgt:`MAP_IMPORTED_CONFIG_DEBUG <MAP_IMPORTED_CONFIG_CONFIG>` is also
 accounted for by this expression.
@@ -594,7 +594,7 @@ dependencies:
   add_library(lib1 lib1.cpp)
   add_library(lib2 lib2.cpp)
   target_link_libraries(lib1 PUBLIC
-    $<TARGET_PROPERTY:POSITION_INDEPENDENT_CODE>:lib2>
+    $<$<TARGET_PROPERTY:POSITION_INDEPENDENT_CODE>:lib2>
   )
   add_library(lib3 lib3.cpp)
   set_property(TARGET lib3 PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE ON)

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-buildsystem.7.rst |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake