diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f1552d7d4b651424dd792ad1b1df65472d1d4ae..eff063dafa31b15acc9fb30d04dc16d652a13c4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ IF(NOT MSVC AND BLAS_FOUND AND LAPACK_FOUND) ADD_SUBDIRECTORY( SimpleTests/SolverTests ) ENDIF() IF(OGS_BUILD_GUI) - ADD_DEFINITIONS(-DOGS_USE_QT) + ADD_DEFINITIONS(-DOGS_BUILD_GUI) ADD_SUBDIRECTORY(Gui) ENDIF() diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 57804f08fcccfdc167dbaaba4da3d016ebfee091..309094892c454daa814642c164112d67f962a50b 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -70,8 +70,8 @@ ENDIF() IF(VTK_FOUND) ADD_DEFINITIONS(-DVTK_FOUND) FIND_PACKAGE(QVTK) - IF(NOT QVTK_FOUND AND OGS_USE_QT) - MESSAGE(FATAL_ERROR "QVTK was not found but is required for OGS_USE_QT! On Ubuntu it can be installed via 'sudo apt-get install libvtk5-qt4-dev'") + IF(NOT QVTK_FOUND AND OGS_BUILD_GUI) + MESSAGE(FATAL_ERROR "QVTK was not found but is required for OGS_BUILD_GUI! On Ubuntu it can be installed via 'sudo apt-get install libvtk5-qt4-dev'") ENDIF() ENDIF() @@ -85,12 +85,12 @@ ENDIF() IF(VTK_NETCDF_FOUND) ADD_DEFINITIONS(-DVTK_NETCDF_FOUND) - INCLUDE_DIRECTORIES(${VTK_NETCDF_FOUND}) + INCLUDE_DIRECTORIES(${VTK_NETCDF_FOUND} ${VTK_DIR}/Utilities) ELSE() SET(NETCDF_CXX TRUE) FIND_PACKAGE(NetCDF) IF(NOT NETCDF_FOUND AND OGS_BUILD_GUI) - MESSAGE(FATAL_ERROR "NetCDF was not found but is required for OGS_USE_QT!") + MESSAGE(FATAL_ERROR "NetCDF was not found but is required for OGS_BUILD_GUI!") ENDIF() ENDIF()