-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[netgen] Fix dependencies. #51494
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
BillyONeal
wants to merge
12
commits into
microsoft:master
Choose a base branch
from
BillyONeal:netgen
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[netgen] Fix dependencies. #51494
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
c3c39e3
[netgen] Fix fontconfig dependency.
BillyONeal bd97ebd
Fix netgen[python] on Windows. The majority of this done by GPT 5.4.
BillyONeal 6164146
Add fontconfig for [occ] under !windows&!osx. (Upstream says UNIX AND…
BillyONeal 429b8ec
Repair patches.
BillyONeal e474454
Oops
BillyONeal 2ebf580
Double oops
BillyONeal 8f7c844
Merge remote-tracking branch 'origin/master' into netgen
BillyONeal fdb0cfc
Change netgen to get cgns from the "target universe" and avoid cross …
BillyONeal da73295
Remove fixed cascade entry.
BillyONeal 95c02d9
Merge branch 'master' into netgen
BillyONeal 14d47de
Remove accidentially committed test files.
BillyONeal e0d5b4e
Just baseline it.
BillyONeal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 c4a579d1..c47b6039 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() | ||
| 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 bf92061..933505d 100644 | ||
| index e5021d5..9d2909e 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -500,7 +500,7 @@ endif(ENABLE_CPP_CORE_GUIDELINES_CHECK) | ||
| @@ -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_library( CGNS_LIBRARY NAMES cgnsdll cgns) | ||
| find_path( CGNS_INCLUDE_DIR cgnslib.h ) | ||
| - 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_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
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
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.
I figure the number of tests that work has not actually changed from this ;)