[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-891-gbc58351
Brad King
brad.king at kitware.com
Wed Nov 2 09:12:24 EDT 2016
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 bc583514658b81631b6d345c25cfb5d1531a44b1 (commit)
via ff3ccc1f2315d3de91ee6a90c8754ea554965c1d (commit)
from 619df3f7c867fceea05c7a7957090627d528b8e8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc583514658b81631b6d345c25cfb5d1531a44b1
commit bc583514658b81631b6d345c25cfb5d1531a44b1
Merge: 619df3f ff3ccc1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 09:12:23 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 2 09:12:23 2016 -0400
Merge topic 'FindHDF5-restore-default-C' into next
ff3ccc1f FindHDF5: Restore pre-3.6 behavior of finding only C by default
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff3ccc1f2315d3de91ee6a90c8754ea554965c1d
commit ff3ccc1f2315d3de91ee6a90c8754ea554965c1d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 09:03:56 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 09:06:56 2016 -0400
FindHDF5: Restore pre-3.6 behavior of finding only C by default
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) changed the default
behavior from finding only the C bindings to finding everything for the
enabled languages. Restore the original behavior for compatibility and
because many projects need only the C bindings.
Closes: #16397
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index ab046e3..7e1b352 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -111,18 +111,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran)
# Validate the list of find components.
-set(HDF5_LANGUAGE_BINDINGS)
if(NOT HDF5_FIND_COMPONENTS)
- get_property(__langs GLOBAL PROPERTY ENABLED_LANGUAGES)
- foreach(__lang IN LISTS __langs)
- if(__lang MATCHES "^(C|CXX|Fortran)$")
- list(APPEND HDF5_LANGUAGE_BINDINGS ${__lang})
- set(HDF5_FIND_REQUIRED_${__lang} True)
- endif()
- endforeach()
- set(FIND_HL ON)
- set(HDF5_FIND_REQUIRED_HL True)
+ set(HDF5_LANGUAGE_BINDINGS "C")
else()
+ set(HDF5_LANGUAGE_BINDINGS)
# add the extra specified components, ensuring that they are valid.
set(FIND_HL OFF)
foreach(component IN LISTS HDF5_FIND_COMPONENTS)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindHDF5.cmake | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list