diff --git a/cmake/Modules/FindERTPython.cmake b/cmake/Modules/FindERTPython.cmake index 328fb9a68..32e1e6ef3 100644 --- a/cmake/Modules/FindERTPython.cmake +++ b/cmake/Modules/FindERTPython.cmake @@ -27,16 +27,16 @@ if(PYTHONINTERP_FOUND) if (ERT_ROOT) list(APPEND PATH_LIST ${ERT_ROOT}) endif() - list(APPEND PATH_LIST ${CMAKE_INSTALL_PREFIX}) + list(APPEND PATH_LIST ${CMAKE_PREFIX_PATH}) # Add various popular sibling alternatives. - list(APPEND PATH_LIST "${PROJECT_SOURCE_DIR}/../ert/build/${PYTHON_INSTALL_PREFIX}" - "${PROJECT_SOURCE_DIR}/../ert/devel/build/${PYTHON_INSTALL_PREFIX}" - "${PROJECT_BINARY_DIR}/../ert-build/${PYTHON_INSTALL_PREFIX}" - "${PROJECT_BINARY_DIR}/../ert/devel/${PYTHON_INSTALL_PREFIX}") + list(APPEND PATH_LIST "${PROJECT_SOURCE_DIR}/../ert/build" + "${PROJECT_SOURCE_DIR}/../ert/devel/build" + "${PROJECT_BINARY_DIR}/../ert-build" + "${PROJECT_BINARY_DIR}/../ert/devel") foreach( PATH ${PATH_LIST}) - set( python_code "import sys; sys.path.insert(0 , '${PATH}'); import os.path; import inspect; import ert; print os.path.dirname(os.path.dirname(inspect.getfile(ert)))") + set( python_code "import sys; sys.path.insert(0 , '${PATH}/${PYTHON_INSTALL_PREFIX}'); import os.path; import inspect; import ert; print os.path.dirname(os.path.dirname(inspect.getfile(ert)))") execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${python_code}" RESULT_VARIABLE import_result OUTPUT_VARIABLE stdout_output diff --git a/jenkins/build-opm-module.sh b/jenkins/build-opm-module.sh index 4867be47c..e3cf9c907 100755 --- a/jenkins/build-opm-module.sh +++ b/jenkins/build-opm-module.sh @@ -56,9 +56,9 @@ function build_upstreams { for upstream in ${upstreams[*]} do echo "Building upstream $upstream=${upstreamRev[$upstream]}" - # Build upstream and execute installation - clone_and_build_module $upstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" ${upstreamRev[$upstream]} $WORKSPACE/serial + # ENABLE_PYTHON - will build the Python wrappers for OpmParser, ignored by the other modules. + clone_and_build_module $upstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install -DENABLE_PYTHON=ON" ${upstreamRev[$upstream]} $WORKSPACE/serial test $? -eq 0 || exit 1 done test $? -eq 0 || exit 1 @@ -85,7 +85,8 @@ function build_downstreams { # Additional cmake parameters: # OPM_DATA_ROOT - passed for modules having opm-data based integration tests # USE_QUADMATH - used by ewoms to disable quadmath support (makes tests usable) - clone_and_build_module $downstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install -DOPM_DATA_ROOT=$OPM_DATA_ROOT -DUSE_QUADMATH=0" ${downstreamRev[$downstream]} $WORKSPACE/serial 1 + # ENABLE_PYTHON - will build the Python wrappers for OpmParser, ignored by the other modules. + clone_and_build_module $downstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install -DOPM_DATA_ROOT=$OPM_DATA_ROOT -DENABLE_PYTHON=ON -DUSE_QUADMATH=0" ${downstreamRev[$downstream]} $WORKSPACE/serial 1 code=$? # ewoms skips tests in nasty ways. ignore return code if [ "$downstream" != "ewoms" ]