fix/simplify Python CMake arguments #473
Merged
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
- Created a variable PYTHONLIBS_CMAKE_ARGS that contains all settings to be used. - No longer pass PYTHON_INCLUDE_DIR from ...DIRS, nor PYTHON_LIBRARY from ..LIBRARIES, but from the variable itself. This caused problems when there are multiple files, and in particular debug and release Python libraries present. Fixes SyneRBI#472
rijobro
reviewed
Jan 15, 2021
SuperBuild.cmake
Outdated
| @@ -232,8 +247,11 @@ option(BUILD_pet_rd_tools "Build pet_rd_tools" OFF) | |||
| option(BUILD_CIL "Build CCPi CIL Modules and ASTRA engine" OFF) | |||
| option(BUILD_CIL_LITE "Build CCPi CIL Modules" OFF) | |||
| option(BUILD_NIFTYREG "Build NIFTYREG" ON) | |||
| option(BUILD_SIRF_Contribs "Build SIRF-Contribs" ON) | |||
|
|
|||
| if (BUILD_PYTHON) | |||
There was a problem hiding this comment.
I guess there's no guarantee that the contributions will always be limited to python.
There was a problem hiding this comment.
that's true, but at the moment it does
which fails if
PYTHON_DOEST isn't set.
Maybe a better fix would be to fix that line
rijobro
approved these changes
Jan 15, 2021
9fb3ae8 to
b35c453
Compare
|
@rijobro I have now used a different strategy for |
|
Sorry I didn't test this before, but I get: |
|
bugger. I guess I was too optimistic. I believe this is due to yet another bug in also for the include files. |
AnderBiguri
added a commit
to AnderBiguri/SIRF-SuperBuild
that referenced
this pull request
Jan 18, 2021
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.
Created a variable
PYTHONLIBS_CMAKE_ARGSthat contains all settings to be used.No longer pass
PYTHON_INCLUDE_DIRfrom...DIRS, norPYTHON_LIBRARYfrom..LIBRARIES, but from the variable itself. This caused problems when there are multiple files, and in particular debug and release Python libraries present.Fixes #472