[Cmake-commits] CMake branch, next, updated. v2.8.11-2245-gc14659f

[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  c14659fcdebb753d41f91b9498a246fd10486539 (commit)
       via  a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139 (commit)
      from  43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c (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=c14659fcdebb753d41f91b9498a246fd10486539
commit c14659fcdebb753d41f91b9498a246fd10486539
Merge: 43e18be a2099a8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 28 09:34:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 28 09:34:06 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
commit a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
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 May 28 09:26:34 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:
 Modules/SelectLibraryConfigurations.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake