[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4242-g9f8f4c7

[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  9f8f4c75e3363c23ee1c857a63a30532740cb7dc (commit)
       via  0f05961f03b2735b32e9da54b32287fb3631e76b (commit)
       via  5e2b499485d9a418b2ccb191f3d33b5ee34dbb1f (commit)
      from  6f94fd4c86d12a666154f9a4ce546ca258689c1d (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=9f8f4c75e3363c23ee1c857a63a30532740cb7dc
commit 9f8f4c75e3363c23ee1c857a63a30532740cb7dc
Merge: 6f94fd4 0f05961
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 19 13:48:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 19 13:48:12 2013 -0400

    Merge topic 'FindHDF5-fix-lib-selection' into next
    
    0f05961 FindHDF5: Fix regression in per-configuration library selection
    5e2b499 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f05961f03b2735b32e9da54b32287fb3631e76b
commit 0f05961f03b2735b32e9da54b32287fb3631e76b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 19 13:29:02 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:35:01 2013 -0400

    FindHDF5: Fix regression in per-configuration library selection
    
    When FindHDF5 was first added in commit e6734068 (Add HDF5 find
    module..., 2009-08-24) it contained a workaround for a bug in
    SelectLibraryConfigurations that did not transform lists correctly.
    That bug was fixed by commit 5797512c (SelectLibraryConfiguration:
    generate correct output when input vars are lists, 2012-07-28).  Then
    refactoring in commit 04d4dc33 (SelectLibraryConfigurations: Use
    -NOTFOUND instead of copying the vars, 2013-07-08) changed undocumented
    behavior on which the original workaround relied.  The result puts
    entries like HDF5_hdf5_LIBRARY_DEBUG-NOTFOUND in HDF5_LIBRARIES.
    
    Fix this by dropping the original workaround since the underlying issue
    has been fixed anyway.  Use the HDF5_${LIB}_LIBRARY selected by the call
    to select_library_configurations directly.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 8514164..0c246a1 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -289,27 +289,13 @@ if( NOT HDF5_FOUND )
                 ENV HDF5_ROOT
                 PATH_SUFFIXES lib Lib )
             select_library_configurations( HDF5_${LIB} )
-            # even though we adjusted the individual library names in
-            # select_library_configurations, we still need to distinguish
-            # between debug and release variants because HDF5_LIBRARIES will
-            # need to specify different lists for debug and optimized builds.
-            # We can't just use the HDF5_${LIB}_LIBRARY variable (which was set
-            # up by the selection macro above) because it may specify debug and
-            # optimized variants for a particular library, but a list of
-            # libraries is allowed to specify debug and optimized only once.
-            list( APPEND HDF5_${LANGUAGE}_LIBRARIES_DEBUG
-                ${HDF5_${LIB}_LIBRARY_DEBUG} )
-            list( APPEND HDF5_${LANGUAGE}_LIBRARIES_RELEASE
-                ${HDF5_${LIB}_LIBRARY_RELEASE} )
+            list(APPEND HDF5_${LANGUAGE}_LIBRARIES ${HDF5_${LIB}_LIBRARY})
         endforeach()
         list( APPEND HDF5_LIBRARY_DIRS ${HDF5_${LANGUAGE}_LIBRARY_DIRS} )
 
         # Append the libraries for this language binding to the list of all
         # required libraries.
-        list( APPEND HDF5_LIBRARIES_DEBUG
-            ${HDF5_${LANGUAGE}_LIBRARIES_DEBUG} )
-        list( APPEND HDF5_LIBRARIES_RELEASE
-            ${HDF5_${LANGUAGE}_LIBRARIES_RELEASE} )
+        list(APPEND HDF5_LIBRARIES ${HDF5_${LANGUAGE}_LIBRARIES})
     endforeach()
 
     # We may have picked up some duplicates in various lists during the above
@@ -329,30 +315,10 @@ if( NOT HDF5_FOUND )
     if( HDF5_INCLUDE_DIRS )
         _remove_duplicates_from_beginning( HDF5_INCLUDE_DIRS )
     endif()
-    if( HDF5_LIBRARIES_DEBUG )
-        _remove_duplicates_from_beginning( HDF5_LIBRARIES_DEBUG )
-    endif()
-    if( HDF5_LIBRARIES_RELEASE )
-        _remove_duplicates_from_beginning( HDF5_LIBRARIES_RELEASE )
-    endif()
     if( HDF5_LIBRARY_DIRS )
         _remove_duplicates_from_beginning( HDF5_LIBRARY_DIRS )
     endif()
 
-    # Construct the complete list of HDF5 libraries with debug and optimized
-    # variants when the generator supports them.
-    if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-        set( HDF5_LIBRARIES )
-        foreach( _lib ${HDF5_LIBRARIES_DEBUG} )
-            list( APPEND HDF5_LIBRARIES debug ${_lib} )
-        endforeach()
-        foreach( _lib ${HDF5_LIBRARIES_RELEASE} )
-            list( APPEND HDF5_LIBRARIES optimized ${_lib} )
-        endforeach()
-    else()
-        set( HDF5_LIBRARIES ${HDF5_LIBRARIES_RELEASE} )
-    endif()
-
     # If the HDF5 include directory was found, open H5pubconf.h to determine if
     # HDF5 was compiled with parallel IO support
     set( HDF5_IS_PARALLEL FALSE )

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

Summary of changes:
 Modules/FindHDF5.cmake    |   38 ++------------------------------------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 3 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
CMake