Commit 924fd9c0 authored by GILLES Sebastien's avatar GILLES Sebastien

#1286 Several fixes in the CMake scripts to make them work properly in all configurations

parent ff418d5c
......@@ -71,6 +71,7 @@ morefem_find_library(LIB_OPEN_MPI "mpi" ${OPEN_MPI_LIB_DIR} "Openmpi")
morefem_find_library(LIB_OPEN_MPI_CXX "mpi_cxx" ${OPEN_MPI_LIB_DIR} "Openmpi (C++)")
morefem_find_library(LIB_PETSC "petsc" ${PETSC_SPECIFIC_LIB_DIR} "Petsc")
morefem_find_library(LIB_PARMETIS "parmetis" ${PARMETIS_LIB_DIR} "Parmetis")
morefem_find_library(LIB_METIS "metis" ${PARMETIS_LIB_DIR} "Metis")
morefem_find_library(LIB_LUA "lua" ${LUA_LIB_DIR} "Lua")
morefem_find_library(LIB_BOOST_FILESYSTEM "boost_filesystem" ${BOOST_LIB_DIR} "Boost filesystem")
morefem_find_library(LIB_BOOST_SYSTEM "boost_system" ${BOOST_LIB_DIR} "Boost system")
......@@ -89,7 +90,8 @@ set(MOREFEM_COMMON_DEP
${LIB_OPEN_MPI}
${LIB_OPEN_MPI_CXX}
${LIB_PETSC}
${LIB_PARMETIS}
${LIB_PARMETIS}
${LIB_METIS}
${LIB_BOOST_FILESYSTEM}
${LIB_BOOST_SYSTEM}
${LIB_BLAS}
......
......@@ -5797,6 +5797,11 @@
BEA961931EC223900003BCFD /* VariationalFormulation.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulation.hxx; sourceTree = "<group>"; };
BEA961991EC224370003BCFD /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
BEA9CB971A1E25DD003A6276 /* TestColoring */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestColoring; sourceTree = BUILT_PRODUCTS_DIR; };
BEAA03BF20A2F1B00070343F /* SourceList.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceList.cmake; sourceTree = "<group>"; };
BEAA03C020A2F6490070343F /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEAA03C120A2F65A0070343F /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEAA03C720A359430070343F /* CatchImplMacro.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CatchImplMacro.cpp; sourceTree = "<group>"; };
BEAA180E20A6E7440070343F /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = Sources/CMakeLists.txt; sourceTree = "<group>"; };
BEABCEBD1AE65A9A00817D37 /* libFormulationSolver.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFormulationSolver.a; sourceTree = BUILT_PRODUCTS_DIR; };
BEABE1DE1E014F730072318A /* demo_input_parameter_test_ipl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_parameter_test_ipl.lua; sourceTree = "<group>"; };
BEAC91241CCF4A1A00C386C5 /* Ensight.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Ensight.hpp; sourceTree = "<group>"; };
......@@ -6031,7 +6036,6 @@
BEC526FB1CC58462000E9027 /* CoordIndexes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CoordIndexes.hpp; sourceTree = "<group>"; };
BEC526FC1CC58462000E9027 /* CoordIndexes.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CoordIndexes.hxx; sourceTree = "<group>"; };
BEC5CFB61F4DBF9B00A2863B /* demo_input_data.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_data.lua; sourceTree = "<group>"; };
BEC5CFB71F4DBF9B00A2863B /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputParameterList.hpp; sourceTree = "<group>"; };
BEC5CFB81F4DBF9B00A2863B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
BEC72C3F2053EB6500E71849 /* QuasiIncompressibleSecondPiolaKirchhoffStressTensor.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = QuasiIncompressibleSecondPiolaKirchhoffStressTensor.hxx; sourceTree = "<group>"; };
BEC72C402053EB6500E71849 /* QuasiIncompressibleSecondPiolaKirchhoffStressTensor.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = QuasiIncompressibleSecondPiolaKirchhoffStressTensor.hpp; sourceTree = "<group>"; };
......@@ -9116,11 +9120,11 @@
BEBFCE7720580C610033C4C1 /* InitializeTestMoReFEMData.hxx */,
BE57F667205BDCDE00BA471A /* Fixture.hpp */,
BE57F666205BDCDE00BA471A /* Fixture.hxx */,
BEAA03C720A359430070343F /* CatchImplMacro.cpp */,
BE09CF3F207E267700DAB24D /* CatchMainTest.hpp */,
BE8E219A207E454800E24E6D /* CheckIdenticalFiles.cpp */,
BE8E219C207E454800E24E6D /* CheckIdenticalFiles.hpp */,
BE8E219B207E454800E24E6D /* CheckIdenticalFiles.hxx */,
BEC5CFB71F4DBF9B00A2863B /* InputParameterList.hpp */,
BE8E21CB207FA4D800E24E6D /* CompareEnsightFiles.cpp */,
BE8E21CD207FA4D800E24E6D /* CompareEnsightFiles.hpp */,
BE8E21CC207FA4D800E24E6D /* CompareEnsightFiles.hxx */,
......@@ -9629,6 +9633,7 @@
BE5A4E201B677B23006822DD /* ConformProjector */ = {
isa = PBXGroup;
children = (
BEAA03C020A2F6490070343F /* CMakeLists.txt */,
BE6EA6271EC333EC0085E651 /* demo_input_test_conform_projector.lua */,
BE5A4E211B677B3D006822DD /* main.cpp */,
BE5A4E231B677B8F006822DD /* InputParameterList.hpp */,
......@@ -9697,6 +9702,7 @@
isa = PBXGroup;
children = (
BEE1E58820615BD1006383BD /* Changelog.md */,
BEAA180E20A6E7440070343F /* CMakeLists.txt */,
BEC37E0617DDC0210021BFB7 /* Accelerate.framework */,
BE5BC3C116C015A100232749 /* Utilities */,
BE5BC2E916C0129000232749 /* ThirdParty */,
......@@ -11250,6 +11256,7 @@
BEA4FC4118214D62002B2EA1 /* FormulationSolver */ = {
isa = PBXGroup;
children = (
BEAA03BF20A2F1B00070343F /* SourceList.cmake */,
BEE5435A1CBAE93600AD52FA /* VariationalFormulation.doxygen */,
BEA4FC4418214D8F002B2EA1 /* VariationalFormulation.hpp */,
BEA4FC4518214D8F002B2EA1 /* VariationalFormulation.hxx */,
......@@ -12067,6 +12074,7 @@
BEC77E961DDDC34800F8B444 /* FromVertexMatching */ = {
isa = PBXGroup;
children = (
BEAA03C120A2F65A0070343F /* CMakeLists.txt */,
BEA197B81DDEFBF800B446C9 /* demo_input_test_from_vertex_matching_vectorial_P1.lua */,
BEA197B91DDEFFA200B446C9 /* demo_input_test_from_vertex_matching_scalar_P1.lua */,
BEA197BA1DDF05ED00B446C9 /* demo_input_test_from_vertex_matching_vectorial_P1b.lua */,
......@@ -13,6 +13,10 @@ morefem_library_module(MOREFEM_OP_INSTANCES MoReFEM_op_instances)
morefem_library_module(MOREFEM_FORMULATION_SOLVER MoReFEM_formulation_solver)
morefem_library_module(MOREFEM_MODEL MoReFEM_model)
add_library(MoReFEM_post_processing ${LIBRARY_TYPE} "")
set(MOREFEM_POST_PROCESSING MoReFEM_post_processing)
if (BUILD_MOREFEM_UNIQUE_LIBRARY)
target_link_libraries(MoReFEM ${MOREFEM_COMMON_DEP})
else()
......@@ -29,6 +33,11 @@ else()
target_link_libraries(MoReFEM_model MoReFEM_formulation_solver)
endif()
target_link_libraries(MoReFEM_post_processing
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
include(Utilities/SourceList.cmake)
include(ThirdParty/SourceList.cmake)
......@@ -52,17 +61,15 @@ include(FormulationSolver/SourceList.cmake)
include(Model/SourceList.cmake)
include(PostProcessing/CMakeLists.txt)
if (BUILD_MOREFEM_UNIQUE_LIBRARY)
morefem_install(MoReFEM)
else()
morefem_install(MoReFEM_utilities MoReFEM_core MoReFEM_geometry MoReFEM_felt MoReFEM_param MoReFEM_op MoReFEM_param_instances MoReFEM_op_instances MoReFEM_formulation_solver MoReFEM_model)
morefem_install(MoReFEM_utilities MoReFEM_core MoReFEM_geometry MoReFEM_felt MoReFEM_param MoReFEM_op MoReFEM_param_instances MoReFEM_op_instances MoReFEM_formulation_solver MoReFEM_model MoReFEM_post_processing)
endif()
include(PostProcessing/CMakeLists.txt)
include(Test/CMakeLists.txt)
include(ModelInstances/CMakeLists.txt)
......@@ -89,7 +96,7 @@ add_library(morefem_cmake INTERFACE)
target_include_directories(morefem_cmake INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${PROJECT_NAME}/include>)
target_link_libraries(morefem_cmake INTERFACE ${MOREFEM_MODEL} )
target_link_libraries(morefem_cmake INTERFACE ${MOREFEM_POST_PROCESSING} )
# #
#
......@@ -100,7 +107,7 @@ target_link_libraries(morefem_cmake INTERFACE ${MOREFEM_MODEL} )
include(CMakePackageConfigHelpers)
install(TARGETS morefem_cmake ${MOREFEM_MAIN_LIBS} Seldon MoReFEMPostProcessing_lib
install(TARGETS morefem_cmake ${MOREFEM_MAIN_LIBS} Seldon ${MOREFEM_POST_PROCESSING}
EXPORT ${PROJECT_NAME}-targets
LIBRARY DESTINATION ${MOREFEM_INSTALL_DIR_LIB}
ARCHIVE DESTINATION ${MOREFEM_INSTALL_DIR_LIB}
......
......@@ -54,8 +54,6 @@ namespace MoReFEM
{
CallBackEnsight::const_iterator it = callbacks_ensight_.find(geometric_elt_name);
if (it == callbacks_ensight_.cend())
throw ExceptionNS::Factory::GeometricElt::InvalidEnsightGeometricEltName(geometric_elt_name,
__FILE__, __LINE__);
......@@ -71,7 +69,6 @@ namespace MoReFEM
return nullptr;
}
RefGeomElt::shared_ptr GeometricEltFactory
::GetRefGeomEltPtr(Advanced::GeometricEltEnum identifier) const
......
......@@ -13,9 +13,9 @@ target_sources(MoReFEM4Elasticity_lib
)
target_link_libraries(MoReFEM4Elasticity_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
add_executable(MoReFEM4Elasticity ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......@@ -26,8 +26,7 @@ morefem_install(MoReFEM4Elasticity MoReFEM4Elasticity_lib)
add_executable(MoReFEM4ElasticityEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4ElasticityEnsightOutput
MoReFEM4Elasticity_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
add_test(ElasticityModel3D
......@@ -87,9 +86,7 @@ morefem_install(MoReFEM4ElasticityEnsightOutput)
add_executable(MoReFEM4ElasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4ElasticityCheckResults
${MOREFEM_MODEL}
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4ElasticityCheckResults)
......
......@@ -51,7 +51,7 @@ void CommonTestCase(std::string&& seq_or_par,
{
oconv.str("");
oconv << "solid_displacement." << std::setw(5) << std::setfill('0') << i << ".scl";
TestNS::CompareEnsightFiles(ref_dir, obtained_dir, oconv.str(), __FILE__, __LINE__, 1.e-12);
TestNS::CompareEnsightFiles(ref_dir, obtained_dir, oconv.str(), __FILE__, __LINE__, 1.e-11);
}
}
......
......@@ -13,9 +13,9 @@ target_sources(MoReFEM4Heat_lib
)
target_link_libraries(MoReFEM4Heat_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
add_executable(MoReFEM4Heat ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......@@ -27,16 +27,13 @@ morefem_install(MoReFEM4Heat MoReFEM4Heat_lib)
add_executable(MoReFEM4HeatEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4HeatEnsightOutput
MoReFEM4Heat_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEM4HeatEnsightOutput)
add_executable(MoReFEM4HeatCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4HeatCheckResults
${MOREFEM_MODEL}
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4HeatCheckResults)
......
......@@ -13,9 +13,9 @@ target_sources(MoReFEM4Hyperelasticity_lib
)
target_link_libraries(MoReFEM4Hyperelasticity_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
add_executable(MoReFEM4Hyperelasticity ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......@@ -26,15 +26,13 @@ morefem_install(MoReFEM4Hyperelasticity MoReFEM4Hyperelasticity_lib)
add_executable(MoReFEM4HyperelasticityEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4HyperelasticityEnsightOutput
MoReFEM4Hyperelasticity_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEM4HyperelasticityEnsightOutput)
add_executable(MoReFEM4HyperelasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4HyperelasticityCheckResults
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4HyperelasticityCheckResults)
......
......@@ -13,9 +13,9 @@ target_sources(MoReFEM4Laplacian_lib
)
target_link_libraries(MoReFEM4Laplacian_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
add_executable(MoReFEM4Laplacian ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......@@ -26,8 +26,7 @@ morefem_install(MoReFEM4Laplacian MoReFEM4Laplacian_lib)
add_executable(MoReFEM4LaplacianEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4LaplacianEnsightOutput
MoReFEM4Laplacian_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEM4LaplacianEnsightOutput)
......@@ -59,9 +58,7 @@ add_test(LaplacianModelEnsightOutput-mpi
add_executable(MoReFEM4LaplacianCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4LaplacianCheckResults
${MOREFEM_MODEL}
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4LaplacianCheckResults)
......
......@@ -13,9 +13,9 @@ target_sources(MoReFEM4RivlinCube_lib
)
target_link_libraries(MoReFEM4RivlinCube_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
add_executable(MoReFEM4RivlinCube ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......@@ -27,8 +27,7 @@ morefem_install(MoReFEM4RivlinCube MoReFEM4RivlinCube_lib)
add_executable(MoReFEM4RivlinCubeEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4RivlinCubeEnsightOutput
MoReFEM4RivlinCube_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEM4RivlinCubeEnsightOutput)
......@@ -87,9 +86,7 @@ add_test(RivlinCubeModelEnsightOutputTetra-mpi
add_executable(MoReFEM4RivlinCubeCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4RivlinCubeCheckResults
${MOREFEM_MODEL}
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4RivlinCubeCheckResults)
......
......@@ -23,8 +23,7 @@ target_link_libraries(MoReFEM4Stokes
add_executable(MoReFEM4StokesEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output_monolithic.cpp)
target_link_libraries(MoReFEM4StokesEnsightOutput
MoReFEM4Stokes_lib
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEM4Stokes MoReFEM4Stokes_lib MoReFEM4StokesEnsightOutput)
......@@ -56,8 +55,7 @@ add_test(StokesModelEnsightOutput-mpi
add_executable(MoReFEM4StokesCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4StokesCheckResults
MoReFEM_test_tools
MoReFEMPostProcessing_lib)
MoReFEM_test_tools)
morefem_install(MoReFEM4StokesCheckResults)
......
set(MOREFEM_POST_PROCESSING MoReFEMPostProcessing_lib)
add_library(MoReFEMPostProcessing_lib ${LIBRARY_TYPE} "")
target_link_libraries(MoReFEMPostProcessing_lib
${MOREFEM_MODEL})
target_sources(MoReFEMPostProcessing_lib
target_sources(${MOREFEM_POST_PROCESSING}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/PostProcessing.cpp" /
......@@ -14,8 +8,6 @@ target_sources(MoReFEMPostProcessing_lib
"${CMAKE_CURRENT_LIST_DIR}/PostProcessing.hxx" /
)
include(${CMAKE_CURRENT_LIST_DIR}/ConvertLinearAlgebra/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/File/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/Exceptions/CMakeLists.txt)
......@@ -24,15 +16,18 @@ include(${CMAKE_CURRENT_LIST_DIR}/Data/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/RefineMeshQuadranglesSpectral/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/OutputDeformedMesh/CMakeLists.txt)
target_link_libraries(${MOREFEM_POST_PROCESSING}
${MOREFEM_MODEL})
add_executable(MoReFEMRefineMeshOutput ${CMAKE_CURRENT_LIST_DIR}/main_refined_mesh_output.cpp)
target_link_libraries(MoReFEMRefineMeshOutput
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
add_executable(MoReFEMConvertMatrixToFreefem ${CMAKE_CURRENT_LIST_DIR}/main_convert_matrix_to_freefem.cpp)
target_link_libraries(MoReFEMConvertMatrixToFreefem
MoReFEMPostProcessing_lib)
${MOREFEM_POST_PROCESSING})
morefem_install(MoReFEMRefineMeshOutput MoReFEMConvertMatrixToFreefem MoReFEMPostProcessing_lib)
morefem_install(MoReFEMRefineMeshOutput MoReFEMConvertMatrixToFreefem)
......@@ -10,7 +10,4 @@ add_executable(MoReFEMTestFromVertexMatching
)
target_link_libraries(MoReFEMTestFromVertexMatching
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEMPostProcessing_lib)
\ No newline at end of file
${MOREFEM_POST_PROCESSING})
......@@ -16,6 +16,15 @@ target_sources(MoReFEM_test_tools
"${CMAKE_CURRENT_LIST_DIR}/CompareEnsightFiles.hxx"
)
# Required at least for shared build on macOS
if (LIBRARY_TYPE STREQUAL "SHARED")
target_sources(MoReFEM_test_tools
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/CatchImplMacro.cpp"
)
endif()
target_link_libraries(MoReFEM_test_tools
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
......
//! \file
//
//
// CatchImpl.cpp
// MoReFEM
//
// Created by sebastien on 09/05/2018.
//Copyright © 2018 Inria. All rights reserved.
//
// Required for at least CMake shared lib build on macOS.
// This was determined empirically, as I want to encapsulate in a library some extensions of Catch, and therefore
// couldn't define CATCH_CONFIG_MAIN or CATCH_CONFIG_RUNNER.
#define CATCH_IMPL
#define CATCH_CONFIG_ALL_PARTS
#include "ThirdParty/Source/Catch/catch.hpp"
......@@ -9,7 +9,6 @@
//
#include "Utilities/Filesystem/File.hpp"
#include "ThirdParty/Source/Catch/catch.hpp"
#include "Test/Tools/CheckIdenticalFiles.hpp"
......
......@@ -124,8 +124,7 @@ namespace MoReFEM
}
}
}
} // namespace anonymous
......
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