From 79c4beb1192b8fc32617b9efe4a5aab30e671989 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 21 Aug 2012 12:11:43 +0200
Subject: [PATCH] Added missing include directory for vtks netcdf.
---
CMakeLists.txt | 2 +-
scripts/cmake/Find.cmake | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f1552d7d4b..eff063dafa3 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 57804f08fcc..309094892c4 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()
--
GitLab