Fix python testing windows #386
Closed
Conversation
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
Use `_WIN32` for the check instead of `WIN32`.
Ensure all appropriate dlls are copied to the test directory. Required mods to FindHDF5, FindSzip, FindZlib and FindPython. Rename python module target from `Silo` to `SiloPy` to prevent conflict with `silo` library target. Update config-site file for my windows machine.
|
@biagas I can't tell if you were waiting on approval from me for this because it looks like a merge to main of stuff already reviewed and merged to 4.11RC. |
markcmiller86
previously approved these changes
Sep 3, 2024
|
I don't recall. Had forgotten about this PR. Looks like I need to resolve some conflicts. Will get to this as soon as I can. |
|
I tried triggering new CI on develop and I don't think that worked because of conflicts. So, I will wait until those are resolved. |
uncomment the option for enabling silex
|
Nothing to do here, after resolution of conflicts, just whitespace changes. Deleting this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge from 4.11RC, PR's #384, #385.