Salome HOME
projects
/
tools
/
configuration.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d217ff
)
Fix detection of HDF5.
po/fix-hdf5
author
Pascal Obry
<pascal.obry@edf.fr>
Thu, 1 Jul 2021 06:53:57 +0000
(08:53 +0200)
committer
Pascal Obry
<pascal.obry@edf.fr>
Mon, 12 Jul 2021 05:55:38 +0000
(07:55 +0200)
Same fix already put in place for Qt5. Use the standard CMake
macro make the detection sucessful.
cmake/FindSalomeHDF5.cmake
patch
|
blob
|
history
diff --git
a/cmake/FindSalomeHDF5.cmake
b/cmake/FindSalomeHDF5.cmake
index 16b91ffe56d10ef08365c1c2a98cee223dfe941f..2f9dbe5923578cdcd3070d416780057e82f3f670 100644
(file)
--- a/
cmake/FindSalomeHDF5.cmake
+++ b/
cmake/FindSalomeHDF5.cmake
@@
-36,7
+36,7
@@
IF(HDF5_ROOT_DIR)
ENDIF()
ENDIF()
-
SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1
)
+
FIND_PACKAGE(HDF5
)
MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR)
# Stupidly enough, CONFIG mode and MODULE mode for HDF5 do not return the same thing ...!