From 6d18022e19c35ecd4b4225561dc6e422505547dd Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sun, 26 Jun 2016 08:58:09 +0200 Subject: [PATCH] FindERTPython will consider CMAKE_INSTALL_PREFIX. --- cmake/Modules/FindERTPython.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/Modules/FindERTPython.cmake b/cmake/Modules/FindERTPython.cmake index 5aab28972..328fb9a68 100644 --- a/cmake/Modules/FindERTPython.cmake +++ b/cmake/Modules/FindERTPython.cmake @@ -23,17 +23,17 @@ if(PYTHONINTERP_FOUND) endif() set(PYTHON_INSTALL_PREFIX "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${PYTHON_PACKAGE_PATH}" CACHE STRING "Subdirectory to install Python modules in") + set(PATH_LIST) if (ERT_ROOT) - set( start_path "${ERT_ROOT}/${PYTHON_INSTALL_PREFIX}" ) - else() - set( start_path "DEFAULT_PATH") + list(APPEND PATH_LIST ${ERT_ROOT}) endif() + list(APPEND PATH_LIST ${CMAKE_INSTALL_PREFIX}) - set( PATH_LIST "${start_path}" - "${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}") + # 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}") 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)))")