OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25 from akva2/add_ert_python

Browse Source 
Look for python module in ERT
This commit is contained in:
Arne Morten Kvarving 2015-07-15 15:37:03 +02:00
commit 5c7ea4a2eb
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/Modules/FindERT.cmake
View File

@ -72,6 +72,25 @@ find_path (ERT_GEN_INCLUDE_DIR
${_no_default_path}
)
find_package(PythonInterp)
if(PYTHONINTERP_FOUND)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c
"from distutils.sysconfig import get_python_lib; print get_python_lib()"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
find_path (ERT_PYTHON_PATH
NAMES "ert/__ert_lib_path.py"
HINTS "${ERT_ROOT}"
PATHS "${PYTHON_SITE_PACKAGES}"
"${PROJECT_SOURCE_DIR}/../ert/build/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages"
"${PROJECT_SOURCE_DIR}/../ert/devel/build/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages"
"${PROJECT_BINARY_DIR}/../ert-build/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages"
"${PROJECT_BINARY_DIR}/../ert/devel/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages")
if(ERT_PYTHON_PATH MATCHES "NOTFOUND")
set(ERT_PYTHON_PATH "")
endif()
endif()
# need all of these libraries
if (CMAKE_SIZEOF_VOID_P)
math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")

16
cmake/Modules/OpmLibMain.cmake
View File

@ -244,6 +244,14 @@ macro (cond_disable_test name)
endif ((NOT DEFINED HAVE_${name}) OR (NOT HAVE_${name}))
endmacro (cond_disable_test name)
# use this target to run all tests
add_custom_target (check
COMMAND ${CMAKE_CTEST_COMMAND}
DEPENDS test-suite
COMMENT "Checking if library is functional"
VERBATIM
)
# special processing for tests
if (COMMAND tests_hook)
tests_hook ()
@ -255,14 +263,6 @@ if (BUILD_TESTING)
opm_compile_satellites (${project} tests "" "${tests_REGEXP}")
endif (BUILD_TESTING)
# use this target to run all tests
add_custom_target (check
COMMAND ${CMAKE_CTEST_COMMAND}
DEPENDS test-suite
COMMENT "Checking if library is functional"
VERBATIM
)
# use this target to check local git commits
add_custom_target(check-commits
COMMAND ${CMAKE_COMMAND}