[cmake][bugfix] Test python/embedded python flags before source_hook.
If cmake is run with `-DOPM_ENABLE_EMBEDDED_PYTHON=ON -DOPM_ENABLE_PYTHON=OFF` a cmake error was produced because the library would depend on python/cxx/builtin_pybind11.cpp which would not be generated. We fix this by doing the Python sanity check (deactivate embedded python if python is disabled) before running source_hook that adds the dependency. Closes #2940
This commit is contained in:
parent
7471cef938
commit
325e559229
@ -80,6 +80,13 @@ if(ENABLE_ECL_INPUT)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(OPM_ENABLE_EMBEDDED_PYTHON AND NOT OPM_ENABLE_PYTHON)
|
||||
# This needs to be here to run before source_hook
|
||||
message(WARNING "Inconsistent settings: OPM_ENABLE_PYTHON=OFF and "
|
||||
"OPM_ENABLE_EMBEDDED_PYTHON=ON. Please use OPM_ENABLE_PYTHON=ON to "
|
||||
"activate. Will disable embedded python in this run.")
|
||||
set(OPM_ENABLE_EMBEDDED_PYTHON OFF CACHE BOOL "Enable embedded python?" FORCE)
|
||||
endif()
|
||||
# read the list of components from this file (in the project directory);
|
||||
# it should set various lists with the names of the files to include
|
||||
include (CMakeLists_files.cmake)
|
||||
@ -479,11 +486,6 @@ if (OPM_ENABLE_PYTHON)
|
||||
target_link_libraries(opmcommon PUBLIC ${PYTHON_LIBRARY})
|
||||
add_definitions(-DEMBEDDED_PYTHON)
|
||||
endif()
|
||||
else()
|
||||
if (OPM_ENABLE_EMBEDDED_PYTHON)
|
||||
message(WARNING "Inconsistent settings OPM_ENABLE_PYTHON / OPM_ENABLE_EMBEDDED_PYTHON")
|
||||
set(OPM_ENABLE_EMBEDDED_PYTHON OFF CACHE BOOL "Enable embedded python?" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
install(DIRECTORY docs/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}
|
||||
|
Loading…
Reference in New Issue
Block a user