[netgen] Fix dependencies. #51494
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/cmake/generate_version_file.cmake b/cmake/generate_version_file.cmake | ||
| index 82ab044..84fd0d3 100644 | ||
| --- a/cmake/generate_version_file.cmake | ||
| +++ b/cmake/generate_version_file.cmake | ||
| @@ -39,7 +39,7 @@ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" "\\1" | ||
| set(NETGEN_VERSION_SHORT ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH}) | ||
| set(NETGEN_VERSION_LONG ${NETGEN_VERSION_SHORT}-${NETGEN_VERSION_TWEAK}-${NETGEN_VERSION_HASH}) | ||
|
|
||
| -if(NETGEN_VERSION_TWEAK) | ||
| +if(NETGEN_VERSION_TWEAK AND NOT NETGEN_VERSION_TWEAK STREQUAL git_version_string) | ||
| # no release version - nightly build | ||
| set(NETGEN_VERSION ${NETGEN_VERSION_LONG}) | ||
| else() |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -1,13 +1,39 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index e5021d5..9d2909e 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -510,15 +510,10 @@ endif(ENABLE_CPP_CORE_GUIDELINES_CHECK) | ||
|
|
||
| add_library(netgen_cgns INTERFACE) | ||
| if(USE_CGNS) | ||
| - find_library( CGNS_LIBRARY NAMES cgns cgnsdll ) | ||
| - find_path( CGNS_INCLUDE_DIR cgnslib.h ) | ||
| + find_package(cgns CONFIG REQUIRED) | ||
| target_compile_definitions(netgen_cgns INTERFACE NG_CGNS) | ||
| - target_include_directories(netgen_cgns INTERFACE ${CGNS_INCLUDE_DIR}) | ||
| - target_link_libraries(netgen_cgns INTERFACE ${CGNS_LIBRARY}) | ||
| - if(NOT WIN32 AND NOT APPLE) # hdf5 is statically linked into cgns in Windows amd MacOS binaries | ||
| - find_library(HDF5_LIBRARY NAMES hdf5 hdf5_serial) | ||
| - target_link_libraries(netgen_cgns INTERFACE ${HDF5_LIBRARY}) | ||
| - endif(NOT WIN32 AND NOT APPLE) | ||
| + target_link_libraries(netgen_cgns INTERFACE | ||
| + $<IF:$<TARGET_EXISTS:CGNS::cgns_shared>,CGNS::cgns_shared,CGNS::cgns_static>) | ||
| endif(USE_CGNS) | ||
|
|
||
| install(FILES ${CMAKE_CURRENT_BINARY_DIR}/netgen_version.hpp ${CMAKE_CURRENT_BINARY_DIR}/netgen_config.hpp DESTINATION ${NG_INSTALL_DIR_INCLUDE}/include COMPONENT netgen_devel) | ||
| diff --git a/cmake/NetgenConfig.cmake.in b/cmake/NetgenConfig.cmake.in | ||
| index 477ed214..05630cac 100644 | ||
| --- a/cmake/NetgenConfig.cmake.in | ||
| +++ b/cmake/NetgenConfig.cmake.in | ||
| @@ -70,6 +70,11 @@ set(NETGEN_USE_NUMA @USE_NUMA@) | ||
| set(NETGEN_PYTHON_RPATH "@NETGEN_PYTHON_RPATH@") | ||
| set(NETGEN_RPATH_TOKEN "@NG_RPATH_TOKEN@") | ||
|
|
||
| +if(NETGEN_USE_CGNS) | ||
| + include(CMakeFindDependencyMacro) | ||
| + find_dependency(cgns CONFIG) | ||
| +endif() | ||
| + | ||
| set(NETGEN_INSTALL_DIR_PYTHON @NG_INSTALL_DIR_PYTHON@) | ||
| set(NETGEN_INSTALL_DIR_BIN @NG_INSTALL_DIR_BIN@) | ||
| set(NETGEN_INSTALL_DIR_LIB @NG_INSTALL_DIR_LIB@) |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,26 @@ | ||
| { | ||
| "/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" : | ||
| { | ||
| "hash" : "db030e9f2a7d74e530965a33037428186657256f", | ||
| "size" : 145095072, | ||
| "timestamp" : 1759437932 | ||
| }, | ||
| "/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" : | ||
| { | ||
| "hash" : "db030e9f2a7d74e530965a33037428186657256f", | ||
| "size" : 145095072, | ||
| "timestamp" : 1759437932 | ||
| }, | ||
| "/usr/bin/c++" : | ||
| { | ||
| "hash" : "683eba44ac1c0233dfaeb0128ef04cca0cf5764e", | ||
| "size" : 1027128, | ||
| "timestamp" : 1766091591 | ||
| }, | ||
| "/usr/bin/cc" : | ||
| { | ||
| "hash" : "9b512455dfa5d38a8af495ae8357c79c990086b7", | ||
| "size" : 1023032, | ||
| "timestamp" : 1766091591 | ||
| } | ||
| } |
|
Contributor
There was a problem hiding this comment. A file that shouldn't be there? |
Empty file.
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -6950,7 +6950,7 @@ | |
| }, | ||
| "netgen": { | ||
| "baseline": "6.2.2401", | ||
| "port-version": 3 | ||
| }, | ||
| "nethost": { | ||
| "baseline": "8.0.3", | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A file that shouldn't be there?