-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[no ci] [email protected]_py310 checkin new patch for hdf5
- Loading branch information
Showing
1 changed file
with
52 additions
and
0 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
patches/[email protected]_py310-hdf5-fix-cmake-reruns.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| commit 7bfead6fe7fcd0dbe7032f28c22d55ffc57f73b1 | ||
| Author: chris <[email protected]> | ||
| Date: Thu Nov 21 15:17:01 2024 -0600 | ||
|
|
||
| foo | ||
|
|
||
| diff --git a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake | ||
| index 1a58efa3e5..88389de946 100644 | ||
| --- a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake | ||
| +++ b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake | ||
| @@ -90,20 +90,28 @@ macro(SetupSalomeSMESH) | ||
| set(HDF5_PREFER_PARALLEL TRUE) # if pkg-config fails, find_package(HDF5) needs this | ||
| endif() | ||
| pkg_search_module(HDF5 ${HDF5_VARIANT}) | ||
| - if(NOT HDF5_FOUND) | ||
| - find_package(HDF5 REQUIRED) | ||
| + if(HOMEBREW_PREFIX) | ||
| + unset(HDF5_FOUND CACHE) | ||
| + message("--------------------------------------------") | ||
| + message("ipatch, DO NOT cache HDF5_FOUND cmake build of hdf5 breaks h5cc") | ||
| + message("see: https://github.com/FreeCAD/homebrew-freecad/issues/583") | ||
| + message("--------------------------------------------") | ||
| else() | ||
| - add_compile_options(${HDF5_CFLAGS}) | ||
| - link_directories(${HDF5_LIBRARY_DIRS}) | ||
| - link_libraries(${HDF5_LIBRARIES}) | ||
| - find_file(Hdf5dotH hdf5.h PATHS ${HDF5_INCLUDE_DIRS} NO_DEFAULT_PATH) | ||
| - if(NOT Hdf5dotH) | ||
| - message( FATAL_ERROR "${HDF5_VARIANT} development header not found.") | ||
| - endif() | ||
| - endif() | ||
| - check_include_file_cxx(hdf5.h HDF5_FOUND) | ||
| - if(NOT HDF5_FOUND) | ||
| - message( FATAL_ERROR "hdf5.h was not found.") | ||
| + if(NOT HDF5_FOUND) | ||
| + find_package(HDF5 REQUIRED CONFIG) | ||
| + else() | ||
| + add_compile_options(${HDF5_CFLAGS}) | ||
| + link_directories(${HDF5_LIBRARY_DIRS}) | ||
| + link_libraries(${HDF5_LIBRARIES}) | ||
| + find_file(Hdf5dotH hdf5.h PATHS ${HDF5_INCLUDE_DIRS} NO_DEFAULT_PATH) | ||
| + if(NOT Hdf5dotH) | ||
| + message( FATAL_ERROR "${HDF5_VARIANT} development header not found.") | ||
| + endif() | ||
| + endif() | ||
| + check_include_file_cxx(hdf5.h HDF5_FOUND) | ||
| + if(NOT HDF5_FOUND) | ||
| + message( FATAL_ERROR "hdf5.h was not found.") | ||
| + endif() | ||
| endif() | ||
|
|
||
| # Med Fichier can require MPI |