[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2881-g40327e6

[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  40327e60727f6d89b211f4c36aad1db680ba7f68 (commit)
       via  c4bcc56156596174ee510c1986b6003f2d84bebf (commit)
      from  aaaa6fd3b2b240666325c074502c6fb7d3ba4831 (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=40327e60727f6d89b211f4c36aad1db680ba7f68
commit 40327e60727f6d89b211f4c36aad1db680ba7f68
Merge: aaaa6fd c4bcc56
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 2 08:24:37 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 2 08:24:37 2013 -0400

    Merge topic 'SelectLibraryConfigurations-cached-library' into next
    
    c4bcc56 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4bcc56156596174ee510c1986b6003f2d84bebf
commit c4bcc56156596174ee510c1986b6003f2d84bebf
Author:     Bjoern Thiel <bthiel at gwdg.de>
AuthorDate: Tue May 28 05:25:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 2 08:21:16 2013 -0400

    SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
    
    The line
    
      set( ${basename}_LIBRARY )
    
    removes the normal variable, but if the corresponding cached variable is
    present then line
    
      list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
    
    uses that and fails.  Replace the original line with
    
      set( ${basename}_LIBRARY "" )
    
    to set the normal variable to empty instead of unsetting it.

diff --git a/Modules/SelectLibraryConfigurations.cmake b/Modules/SelectLibraryConfigurations.cmake
index 62137bb..5bca064 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -62,7 +62,7 @@ macro( select_library_configurations basename )
         # 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 )
+            set( ${basename}_LIBRARY "" )
             foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
                 list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
             endforeach()

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

Summary of changes:


hooks/post-receive
-- 
CMake