From b8c3cd2395b87e363a13d76080a1be2798d826b3 Mon Sep 17 00:00:00 2001 From: Sebastien Gilles Date: Tue, 6 Feb 2018 09:58:47 +0100 Subject: [PATCH] #1217 Add properly the flag definitions if one of the macro is defined in the settings file. --- CMakeLists.txt | 16 ++++++++++++++++ cmake/Paths.cmake | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92bea5673..77726dbf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,22 @@ endif() include(${PATH_FILE}) +if(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE) + message("ADDING FLAG MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE") + add_definitions(-DMOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE) +endif() + +if(MOREFEM_EXTENDED_TIME_KEEP) + message("ADDING FLAG MOREFEM_EXTENDED_TIME_KEEP") + add_definitions(-DMOREFEM_EXTENDED_TIME_KEEP) +endif() + +if(MOREFEM_CHECK_NAN_AND_INF) + message("ADDING FLAG MOREFEM_CHECK_NAN_AND_INF") + add_definitions(-DMOREFEM_CHECK_NAN_AND_INF) +endif() + + # =================================================================================================================== # Set some values in the path file that night be overridden by cache variables. # WARNING: all those calls must occur BEFORE the call to project, so that overriding remains possible. diff --git a/cmake/Paths.cmake b/cmake/Paths.cmake index b09674c91..d101bd774 100644 --- a/cmake/Paths.cmake +++ b/cmake/Paths.cmake @@ -11,13 +11,13 @@ set(BUILD_MOREFEM_UNIQUE_LIBRARY False) # Whether specific macros should be activated or not. # If true, add a (costly) method that gives an hint whether an UpdateGhost() call was relevant or not. -set(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE False) +set(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE False) # If true, TimeKeep gains the ability to track times between each call of PrintTimeElapsed(). If not, PrintTimeElapsed() is flatly ignored. -set(MOREFEM_EXTENDED_TIME_KEEP False) +set(MOREFEM_EXTENDED_TIME_KEEP False) # If true, there are additional checks that no nan and inf appears in the code. Even if False, solver always check for the validity of its solution (if a nan or an inf is present the SolveLinear() or SolveNonLinear() operation throws with a dedicated Petsc error). Advised in debug mode and up to you in release mode. -set(MOREFEM_CHECK_NAN_AND_INF True) +set(MOREFEM_CHECK_NAN_AND_INF False) # OpenMPI libary. set(OPEN_MPI_INCL_DIR /Users/Shared/LibraryVersions/clang/Openmpi/include ) -- GitLab