Skip to content

Commit

Permalink
Merge pull request #6 from joakim-hove/require-python
Browse files Browse the repository at this point in the history
The gui is *not* optional
  • Loading branch information
joakim-hove authored May 15, 2017
2 parents 2552f85 + b30a76a commit 9bc5885
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@ find_python_package(numpy 1.7.1 ${PYTHON_INSTALL_PREFIX})

# libres python needs ecl, cwrap and numpy
if (NOT DEFINED PY_ecl OR NOT DEFINED PY_cwrap OR NOT DEFINED PY_numpy OR NOT DEFINED PY_res)
message(WARNING "res, ecl, cwrap, or numpy module not found - Python wrappers not enabled")
return()
message(SEND_ERROR "res, ecl, cwrap, or numpy module not found ")
endif()

#-----------------------------------------------------------------

if (ERT_BUILD_GUI)
find_python_package(PyQt4 4.8.0 ${PYTHON_INSTALL_PREFIX})
find_python_package(matplotlib 1.2.0 ${PYTHON_INSTALL_PREFIX})
find_python_package(pandas 0.15.1 ${PYTHON_INSTALL_PREFIX})
find_python_package(scipy 0.12.1 ${PYTHON_INSTALL_PREFIX})
if(NOT DEFINED PY_PyQt4 OR NOT DEFINED PY_matplotlib OR NOT DEFINED PY_scipy OR NOT DEFINED PY_pandas)
message(SEND_ERROR "Cannot build GUI without PyQt4, matplotlib, scipy, or pandas")
endif()
find_python_package(PyQt4 4.8.0 ${PYTHON_INSTALL_PREFIX})
find_python_package(matplotlib 1.2.0 ${PYTHON_INSTALL_PREFIX})
find_python_package(pandas 0.15.1 ${PYTHON_INSTALL_PREFIX})
find_python_package(scipy 0.12.1 ${PYTHON_INSTALL_PREFIX})

if(NOT DEFINED PY_PyQt4 OR NOT DEFINED PY_matplotlib OR NOT DEFINED PY_scipy OR NOT DEFINED PY_pandas)
message(SEND_ERROR "Cannot build GUI without PyQt4, matplotlib, scipy, or pandas")
endif()


Expand Down

0 comments on commit 9bc5885

Please sign in to comment.