From aa09373f18df1a1c61d8b7aca71277f34b15a8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Gr=C3=B8n=C3=A5s=20Drange?= Date: Tue, 4 Oct 2016 12:49:05 +0200 Subject: [PATCH] added find cwrap from opm-common --- opm/parser/eclipse/python/CMakeLists.txt | 1 + opm/parser/eclipse/python/cmake/python.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/opm/parser/eclipse/python/CMakeLists.txt b/opm/parser/eclipse/python/CMakeLists.txt index 1b11eff5d..922360d86 100644 --- a/opm/parser/eclipse/python/CMakeLists.txt +++ b/opm/parser/eclipse/python/CMakeLists.txt @@ -1,5 +1,6 @@ find_package (PythonInterp REQUIRED) find_package (ERTPython) +find_package (Cwrap) if (ERT_PYTHON_PATH) add_subdirectory( c_inter ) diff --git a/opm/parser/eclipse/python/cmake/python.cmake b/opm/parser/eclipse/python/cmake/python.cmake index fa3964da6..6baf54904 100644 --- a/opm/parser/eclipse/python/cmake/python.cmake +++ b/opm/parser/eclipse/python/cmake/python.cmake @@ -57,6 +57,6 @@ function (addPythonTest TEST_NAME TEST_CLASS) if(TEST_OPTIONS_ENVIRONMENT) set_property(TEST python.tests.${TEST_NAME} PROPERTY ENVIRONMENT ${TEST_OPTIONS_ENVIRONMENT}) endif() - set_property(TEST python.tests.${TEST_NAME} PROPERTY ENVIRONMENT "PYTHONPATH=${ERT_PYTHON_PATH}:${PYTHONPATH}") + set_property(TEST python.tests.${TEST_NAME} PROPERTY ENVIRONMENT "PYTHONPATH=${ERT_PYTHON_PATH}:${CWRAP_PYTHON_PATH}:${PYTHONPATH}") endfunction(addPythonTest)