[Cmake-commits] CMake branch, next, updated. v2.8.7-2275-ge8b8678

[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  e8b867897e0df0d56950ab945ec45ed820e90d75 (commit)
       via  1eaf1c9b0fae2142f8dca60f6b898afb74045058 (commit)
       via  208569f1da0cf2c481f4b377ad4fe542a3a74e2a (commit)
      from  2595ea7bdabf97d1a0978ad06ae122fcdb3d823e (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=e8b867897e0df0d56950ab945ec45ed820e90d75
commit e8b867897e0df0d56950ab945ec45ed820e90d75
Merge: 2595ea7 1eaf1c9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 03:07:07 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 03:07:07 2012 -0500

    Merge topic 'improve-selectlibraryconfigurations' into next
    
    1eaf1c9 SelectLibraryConfigurations: do not output identical configurations
    208569f KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eaf1c9b0fae2142f8dca60f6b898afb74045058
commit 1eaf1c9b0fae2142f8dca60f6b898afb74045058
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 08:21:12 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 09:06:47 2012 +0100

    SelectLibraryConfigurations: do not output identical configurations
    
    If the debug and release libraries are the same (which usually means only one
    of them was found) do not output the library as "optimized" and "debug", but
    just as one plain library. At the end this means that the Find* output of the
    avarage (Un*x) user will be much less cluttered.

diff --git a/Modules/SelectLibraryConfigurations.cmake b/Modules/SelectLibraryConfigurations.cmake
index 51b4dda..2e8ade0 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -15,7 +15,6 @@
 # basename_LIBRARY and basename_LIBRARIES will take only the release values.
 
 #=============================================================================
-# Copyright 2009 Kitware, Inc.
 # Copyright 2009 Will Dicharry <wdicharry at stellarscience.com>
 # Copyright 2005-2009 Kitware, Inc.
 #
@@ -49,7 +48,8 @@ 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 )
+    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 )
@@ -65,7 +65,7 @@ macro( select_library_configurations basename )
             set( ${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} )
             set( ${basename}_LIBRARIES ${${basename}_LIBRARY_RELEASE} )
         endif( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-    endif( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
+    endif()
 
     set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH 
         "The ${basename} library" )
@@ -79,4 +79,3 @@ macro( select_library_configurations basename )
         ${basename}_LIBRARY_DEBUG
     )
 endmacro( select_library_configurations )
-

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

Summary of changes:
 Modules/SelectLibraryConfigurations.cmake |    7 +++----
 Source/kwsys/kwsysDateStamp.cmake         |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake