[Cmake-commits] CMake branch, next, updated. v2.8.8-3596-g298ba6f

[Rolf Eike Beer]

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  298ba6f12314e43af95ed9039b714a4157bfdd6d (commit)
       via  5797512cec6ce106cf3277c59abd2ccb86ce2846 (commit)
      from  c576a4ba32d54ee050ef15da967e60aca9ebafaa (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=298ba6f12314e43af95ed9039b714a4157bfdd6d
commit 298ba6f12314e43af95ed9039b714a4157bfdd6d
Merge: c576a4b 5797512
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jul 29 11:46:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 29 11:46:08 2012 -0400

    Merge topic 'SelectLibraryConfiguration-multi-lib-per-var2' into next
    
    5797512 SelectLibraryConfiguration: generate correct output when input vars are lists


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5797512cec6ce106cf3277c59abd2ccb86ce2846
commit 5797512cec6ce106cf3277c59abd2ccb86ce2846
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 28 10:25:17 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jul 29 17:45:53 2012 +0200

    SelectLibraryConfiguration: generate correct output when input vars are lists
    
    In case that any of the input variables that hold the library names contains
    more than just a single library the "debug" or "optimized" keywords were only
    prepended to the first item, making all other libs appear in all
    configurations. Just treat both input variables as lists.
    
    Thanks to Philipp Berger <newsletters at philippberger.de> for pointing me at
    this.

diff --git a/Modules/SelectLibraryConfigurations.cmake b/Modules/SelectLibraryConfigurations.cmake
index 2e8ade0..dbff487 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -48,17 +48,19 @@ macro( select_library_configurations basename )
     # if only the debug version was found, set the release value to be the
     # debug value.
     _set_library_name( ${basename} DEBUG RELEASE )
-    if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
-           NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE)
+    if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
+           NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE )
         # if the generator supports configuration types or CMAKE_BUILD_TYPE
         # is set, then set optimized and debug options.
         if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-            set( ${basename}_LIBRARY 
-                optimized ${${basename}_LIBRARY_RELEASE}
-                debug ${${basename}_LIBRARY_DEBUG} )
-            set( ${basename}_LIBRARIES 
-                optimized ${${basename}_LIBRARY_RELEASE}
-                debug ${${basename}_LIBRARY_DEBUG} )
+            set( ${basename}_LIBRARY )
+            foreach( _libname LISTS ${basename}_LIBRARY_RELEASE )
+                list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
+            endforeach()
+            foreach( _libname LISTS ${basename}_LIBRARY_DEBUG )
+                list( APPEND ${basename}_LIBRARY debug "${_libname}" )
+            endforeach()
+            set( ${basename}_LIBRARIES "${${basename}_LIBRARY}" )
         else( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
             # If there are no configuration types or build type, just use
             # the release version

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

Summary of changes:


hooks/post-receive
-- 
CMake