Commit 1780e306 authored by GILLES Sebastien's avatar GILLES Sebastien

#859 Modifications to take into account debug/release compilation of Boost.

parent 6fc3842f
...@@ -4070,6 +4070,8 @@ ...@@ -4070,6 +4070,8 @@
BE7A38881E8D3166009DFFC3 /* GreenLagrangeTensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GreenLagrangeTensor.cpp; sourceTree = "<group>"; }; BE7A38881E8D3166009DFFC3 /* GreenLagrangeTensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GreenLagrangeTensor.cpp; sourceTree = "<group>"; };
BE7A38891E8D3167009DFFC3 /* GreenLagrangeTensor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hpp; sourceTree = "<group>"; }; BE7A38891E8D3167009DFFC3 /* GreenLagrangeTensor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hpp; sourceTree = "<group>"; };
BE7A388A1E8D3167009DFFC3 /* GreenLagrangeTensor.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hxx; sourceTree = "<group>"; }; BE7A388A1E8D3167009DFFC3 /* GreenLagrangeTensor.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hxx; sourceTree = "<group>"; };
BE7A8717215BEDB6000C3428 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BE7A8718215BEDB6000C3428 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
BE7C1D0B1F4F2C8C000403E7 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; BE7C1D0B1F4F2C8C000403E7 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
BE7C1D0D1F4F2E8B000403E7 /* demo_input_parameter_movemesh.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_parameter_movemesh.lua; sourceTree = "<group>"; }; BE7C1D0D1F4F2E8B000403E7 /* demo_input_parameter_movemesh.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_parameter_movemesh.lua; sourceTree = "<group>"; };
BE7C942C1F5FE614003D2C52 /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputParameterList.hpp; sourceTree = "<group>"; }; BE7C942C1F5FE614003D2C52 /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputParameterList.hpp; sourceTree = "<group>"; };
...@@ -8419,6 +8421,15 @@ ...@@ -8419,6 +8421,15 @@
path = EnsightCaseReader; path = EnsightCaseReader;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
BE7A8716215BEDB6000C3428 /* Valgrind */ = {
isa = PBXGroup;
children = (
BE7A8717215BEDB6000C3428 /* CMakeLists.txt */,
BE7A8718215BEDB6000C3428 /* main.cpp */,
);
path = Valgrind;
sourceTree = "<group>";
};
BE7C942A1F5FE614003D2C52 /* TestFunctions */ = { BE7C942A1F5FE614003D2C52 /* TestFunctions */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -10141,6 +10152,7 @@ ...@@ -10141,6 +10152,7 @@
BE2243E720A1ACD3006AD11E /* CMakeLists.txt */, BE2243E720A1ACD3006AD11E /* CMakeLists.txt */,
BEC5CFB51F4DBF9B00A2863B /* Gather */, BEC5CFB51F4DBF9B00A2863B /* Gather */,
BEE734CF1F75432D001D01A9 /* SendReceive */, BEE734CF1F75432D001D01A9 /* SendReceive */,
BE7A8716215BEDB6000C3428 /* Valgrind */,
); );
path = Mpi; path = Mpi;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -14273,7 +14285,7 @@ ...@@ -14273,7 +14285,7 @@
LD_NO_PIE = NO; LD_NO_PIE = NO;
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
LLVM_LTO = NO; LLVM_LTO = NO;
MACOSX_DEPLOYMENT_TARGET = 10.13; MACOSX_DEPLOYMENT_TARGET = 10.14;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)", "$(OTHER_CFLAGS)",
...@@ -14361,7 +14373,7 @@ ...@@ -14361,7 +14373,7 @@
LD_NO_PIE = NO; LD_NO_PIE = NO;
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
LLVM_LTO = YES; LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13; MACOSX_DEPLOYMENT_TARGET = 10.14;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)", "$(OTHER_CFLAGS)",
"-ftemplate-backtrace-limit=0", "-ftemplate-backtrace-limit=0",
include(${CMAKE_CURRENT_LIST_DIR}/Gather/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/Gather/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/SendReceive/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/SendReceive/CMakeLists.txt)
\ No newline at end of file include(${CMAKE_CURRENT_LIST_DIR}/Valgrind/CMakeLists.txt)
\ No newline at end of file
...@@ -14,9 +14,9 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources ...@@ -14,9 +14,9 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources
THIRD_PARTY_LIBRARY_DIR = /Volumes/Data/opt THIRD_PARTY_LIBRARY_DIR = /Volumes/Data/opt
HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${THIRD_PARTY_LIBRARY_DIR}/Boost/include ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include ${THIRD_PARTY_LIBRARY_DIR}/QuantStack/include HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include ${THIRD_PARTY_LIBRARY_DIR}/QuantStack/include
LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/lib LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib
WARNING_CFLAGS = -Weverything -Wno-c++98-compat -Wno-padded -Wno-c++98-compat-pedantic -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation-unknown-command -Wno-documentation -Wno-undefined-func-template -Wno-c++1z-extensions WARNING_CFLAGS = -Weverything -Wno-c++98-compat -Wno-padded -Wno-c++98-compat-pedantic -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation-unknown-command -Wno-documentation -Wno-undefined-func-template -Wno-c++1z-extensions
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include "morefem_common.xcconfig" #include "morefem_common.xcconfig"
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/include HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/include ${THIRD_PARTY_LIBRARY_DIR}/Boost/debug/include
LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/lib LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/debug/lib
GCC_OPTIMIZATION_LEVEL = 0 GCC_OPTIMIZATION_LEVEL = 0
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include "morefem_common.xcconfig" #include "morefem_common.xcconfig"
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/include HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/include ${THIRD_PARTY_LIBRARY_DIR}/Boost/release/include
LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/lib LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/release/lib
GCC_OPTIMIZATION_LEVEL = 3 GCC_OPTIMIZATION_LEVEL = 3
......
...@@ -35,11 +35,15 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") ...@@ -35,11 +35,15 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)# Add LTO support in non debug mode. set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)# Add LTO support in non debug mode.
set(PETSC_SPECIFIC_INCL_DIR ${PETSC_DEBUG_INCL_DIR} ) set(PETSC_SPECIFIC_INCL_DIR ${PETSC_DEBUG_INCL_DIR} )
set(PETSC_SPECIFIC_LIB_DIR ${PETSC_DEBUG_LIB_DIR} ) set(PETSC_SPECIFIC_LIB_DIR ${PETSC_DEBUG_LIB_DIR} )
add_definitions(-DSELDON_CHECK_BOUNDS -DSELDON_CHECK_DIMENSIONS -DDEBUG=1) set(BOOST_INCL_DIR ${BOOST_DEBUG_INCL_DIR} )
set(BOOST_LIB_DIR ${BOOST_DEBUG_LIB_DIR} )
add_definitions(-DSELDON_CHECK_BOUNDS -DSELDON_CHECK_DIMENSIONS -DDEBUG=1)
else() else()
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
set(PETSC_SPECIFIC_INCL_DIR ${PETSC_RELEASE_INCL_DIR} ) set(PETSC_SPECIFIC_INCL_DIR ${PETSC_RELEASE_INCL_DIR} )
set(PETSC_SPECIFIC_LIB_DIR ${PETSC_RELEASE_LIB_DIR} ) set(PETSC_SPECIFIC_LIB_DIR ${PETSC_RELEASE_LIB_DIR} )
set(BOOST_INCL_DIR ${BOOST_RELEASE_INCL_DIR} )
set(BOOST_LIB_DIR ${BOOST_RELEASE_LIB_DIR} )
endif() endif()
add_definitions(-DSELDON_WITH_LAPACK -DSELDON_WITH_BLAS -DSELDON_WITH_COMPILED_LIBRARY) add_definitions(-DSELDON_WITH_LAPACK -DSELDON_WITH_BLAS -DSELDON_WITH_COMPILED_LIBRARY)
......
...@@ -42,8 +42,12 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA ...@@ -42,8 +42,12 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA
set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.") set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.")
set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.") set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.")
set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") set(BOOST_DEBUG_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/include CACHE PATH "Include directory of Boost library.")
set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") set(BOOST_DEBUG_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/lib CACHE PATH "Lib directory of Boost library.")
set(BOOST_RELEASE_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/include CACHE PATH "Include directory of Boost library.")
set(BOOST_RELEASE_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/lib CACHE PATH "Lib directory of Boost library.")
set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.") set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.")
......
...@@ -42,8 +42,11 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA ...@@ -42,8 +42,11 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA
set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.") set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.")
set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.") set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.")
set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") set(BOOST_DEBUG_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/include CACHE PATH "Include directory of Boost library.")
set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") set(BOOST_DEBUG_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/lib CACHE PATH "Lib directory of Boost library.")
set(BOOST_RELEASE_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/include CACHE PATH "Include directory of Boost library.")
set(BOOST_RELEASE_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/lib CACHE PATH "Lib directory of Boost library.")
set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.") set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment