Skip to content
Snippets Groups Projects
Commit 42b38d1b authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge pull request #511 from endJunction/EigenSystemInclude

Eigen/LIS system includes on top level.
parents 757a46c0 150ffca9
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,7 @@ INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib ) ...@@ -117,6 +117,7 @@ INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib )
IF(OGS_USE_LIS) IF(OGS_USE_LIS)
ADD_DEFINITIONS(-DUSE_LIS) ADD_DEFINITIONS(-DUSE_LIS)
INCLUDE_DIRECTORIES(SYSTEM ${LIS_INCLUDE_DIR})
ENDIF() ENDIF()
IF(OGS_USE_PETSC) IF(OGS_USE_PETSC)
...@@ -135,6 +136,7 @@ IF(OGS_USE_EIGEN) ...@@ -135,6 +136,7 @@ IF(OGS_USE_EIGEN)
IF (EIGEN_NO_DEBUG) IF (EIGEN_NO_DEBUG)
ADD_DEFINITIONS(-DEIGEN_NO_DEBUG) ADD_DEFINITIONS(-DEIGEN_NO_DEBUG)
ENDIF() ENDIF()
INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
ENDIF() ENDIF()
ADD_SUBDIRECTORY( Applications ) ADD_SUBDIRECTORY( Applications )
......
...@@ -53,10 +53,6 @@ IF(METIS_FOUND) ...@@ -53,10 +53,6 @@ IF(METIS_FOUND)
) )
ENDIF() ENDIF()
IF (LIS_FOUND)
INCLUDE_DIRECTORIES(${LIS_INCLUDE_DIR})
ENDIF()
IF (OGS_USE_PETSC) IF (OGS_USE_PETSC)
INCLUDE_DIRECTORIES ( LinAlg/PETSc ) INCLUDE_DIRECTORIES ( LinAlg/PETSc )
......
...@@ -28,14 +28,6 @@ INCLUDE_DIRECTORIES( ...@@ -28,14 +28,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/BaseLib ${CMAKE_BINARY_DIR}/BaseLib
) )
IF (LIS_FOUND)
INCLUDE_DIRECTORIES(${LIS_INCLUDE_DIR})
ENDIF()
IF (OGS_USE_EIGEN)
INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
ENDIF()
ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES}) ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES})
SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing) SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing)
IF(TARGET Eigen) IF(TARGET Eigen)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment