From 7e7e1ad53e5f6a33cdfdc128d56aa7fa0a714474 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 20 Nov 2015 14:40:21 +0100
Subject: [PATCH] Moved definitions before adding subdirectories in CMake.
This should also fix local VTK build with OGS_USE_PETSC.
---
CMakeLists.txt | 53 +++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1f7ba9a27..308df8939f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,33 @@ set_property(CACHE
OGS_LIB_EIGEN
PROPERTY STRINGS "Default" "System" "Local")
+###################
+### Definitions ###
+###################
+if(OGS_USE_LIS)
+ add_definitions(-DUSE_LIS)
+ include_directories(SYSTEM ${LIS_INCLUDE_DIR})
+endif()
+
+if(OGS_USE_PETSC)
+ add_definitions(-DUSE_PETSC)
+ set(OGS_USE_MPI ON CACHE BOOL "Use MPI")
+endif()
+
+# Use MPI
+if(OGS_USE_MPI)
+ add_definitions(-DUSE_MPI)
+endif()
+
+if(OGS_USE_EIGEN)
+ add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_ZERO)
+ add_definitions(-DOGS_USE_EIGEN)
+ if (EIGEN_NO_DEBUG)
+ add_definitions(-DEIGEN_NO_DEBUG)
+ endif()
+ include_directories (SYSTEM ${EIGEN3_INCLUDE_DIR})
+endif()
+
######################
### Subdirectories ###
######################
@@ -130,32 +157,6 @@ include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gtest/include
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/autocheck/include )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include )
-if(OGS_USE_LIS)
- add_definitions(-DUSE_LIS)
- include_directories(SYSTEM ${LIS_INCLUDE_DIR})
-endif()
-
-# Use PETSc package for global assembly and linear sover for parallel computing
-if(OGS_USE_PETSC)
- add_definitions(-DUSE_PETSC)
- set(OGS_USE_MPI ON)
-endif()
-
-# Use MPI
-if(OGS_USE_MPI)
- add_definitions(-DUSE_MPI)
-endif()
-
-if(OGS_USE_EIGEN)
-# add_definitions(-DEIGEN_DEFAULT_DENSE_INDEX_TYPE=std::size_t)
- add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_ZERO)
- add_definitions(-DOGS_USE_EIGEN)
- if (EIGEN_NO_DEBUG)
- add_definitions(-DEIGEN_NO_DEBUG)
- endif()
- include_directories (SYSTEM ${EIGEN3_INCLUDE_DIR})
-endif()
-
add_subdirectory( Applications )
add_subdirectory( AssemblerLib )
add_subdirectory( BaseLib )
--
GitLab