-
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 3 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,14 +1,13 @@ | ||
| diff --git a/libsrc/core/CMakeLists.txt b/libsrc/core/CMakeLists.txt | ||
| index c4f4795..cd5ad50 100644 | ||
| --- a/libsrc/core/CMakeLists.txt | ||
| index d91a1bbec2..0d10cc2e85 100644 | ||
| --- a/libsrc/core/CMakeLists.txt | ||
| +++ b/libsrc/core/CMakeLists.txt | ||
| @@ -28,8 +28,7 @@ endif(USE_PYTHON) | ||
|
|
||
| @@ -35,7 +35,7 @@ endif(USE_PYTHON) | ||
| if(WIN32) | ||
| target_compile_options(ngcore PUBLIC /bigobj /MP /W1 /wd4068) | ||
| - get_WIN32_WINNT(ver) | ||
| get_WIN32_WINNT(ver) | ||
| - target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32) | ||
| + target_compile_definitions(ngcore PUBLIC WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32) | ||
| + target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32 Py_NO_LINK_LIB) | ||
| target_link_options(ngcore PUBLIC /ignore:4273 /ignore:4217 /ignore:4049) | ||
| endif(WIN32) | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.