Commit da6c9a08 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1398 Another attempt to make compilation work in all architectures.

parent d4da504b
Pipeline #73341 passed with stages
in 28 minutes and 27 seconds
......@@ -40,6 +40,12 @@ target_link_libraries(MoReFEM_post_processing
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG})
target_link_libraries(${MOREFEM_TEST_TOOLS}
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
${LIB_BOOST_TEST})
include(Utilities/SourceList.cmake)
include(ThirdParty/SourceList.cmake)
......
......@@ -88,10 +88,7 @@ morefem_install(MoReFEM4ElasticityEnsightOutput)
add_executable(MoReFEM4ElasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4ElasticityCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4ElasticityCheckResults)
......
......@@ -33,10 +33,7 @@ morefem_install(MoReFEM4HeatEnsightOutput)
add_executable(MoReFEM4HeatCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4HeatCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4HeatCheckResults)
......
......@@ -32,10 +32,7 @@ morefem_install(MoReFEM4HyperelasticityEnsightOutput)
add_executable(MoReFEM4HyperelasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4HyperelasticityCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4HyperelasticityCheckResults)
......
......@@ -59,10 +59,7 @@ add_test(LaplacianModelEnsightOutput-mpi
add_executable(MoReFEM4LaplacianCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4LaplacianCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4LaplacianCheckResults)
......
......@@ -88,10 +88,7 @@ add_test(RivlinCubeModelEnsightOutputTetra-mpi
add_executable(MoReFEM4RivlinCubeCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4RivlinCubeCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4RivlinCubeCheckResults)
......
......@@ -56,10 +56,7 @@ add_test(StokesModelEnsightOutput-mpi
add_executable(MoReFEM4StokesCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
target_link_libraries(MoReFEM4StokesCheckResults
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install(MoReFEM4StokesCheckResults)
......
......@@ -3,8 +3,7 @@ add_executable(MoReFEMTestMoReFEMDataCommandLineOptions
)
target_link_libraries(MoReFEMTestMoReFEMDataCommandLineOptions
${MOREFEM_CORE}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(MoReFEMDataCommandLineOptions
MoReFEMTestMoReFEMDataCommandLineOptions
......
......@@ -3,8 +3,7 @@ add_executable(MoReFEMTestMoReFEMDataInitialCondition
)
target_link_libraries(MoReFEMTestMoReFEMDataInitialCondition
${MOREFEM_CORE}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(MoReFEMDataInitialCondition
MoReFEMTestMoReFEMDataInitialCondition
......
......@@ -3,8 +3,7 @@ add_executable(MoReFEMTestMoReFEMDataInputData
)
target_link_libraries(MoReFEMTestMoReFEMDataInputData
${MOREFEM_CORE}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(MoReFEMDataInputData
MoReFEMTestMoReFEMDataInputData
......
......@@ -3,8 +3,7 @@ add_executable(MoReFEMTestMoReFEMDataParameter
)
target_link_libraries(MoReFEMTestMoReFEMDataParameter
${MOREFEM_CORE}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(MoReFEMDataParameter
MoReFEMTestMoReFEMDataParameter
......
......@@ -4,10 +4,7 @@ add_executable(MoReFEMTestVariableTimeStep
)
target_link_libraries(MoReFEMTestVariableTimeStep
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_CORE}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(VariableTimeStep
......
......@@ -17,7 +17,4 @@ add_executable(MoReFEMTestOperatorTestFunctions
)
target_link_libraries(MoReFEMTestOperatorTestFunctions
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
......@@ -16,10 +16,7 @@ target_sources(MoReFEMTestOperatorGradGrad_lib
)
target_link_libraries(MoReFEMTestOperatorGradGrad_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_executable(MoReFEMTestOperatorGradGrad3D ${CMAKE_CURRENT_LIST_DIR}/main_3D.cpp)
......
......@@ -16,10 +16,7 @@ target_sources(MoReFEMTestOperatorMass_lib
)
target_link_libraries(MoReFEMTestOperatorMass_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_executable(MoReFEMTestOperatorMass3D ${CMAKE_CURRENT_LIST_DIR}/main_3D.cpp)
......
......@@ -15,10 +15,7 @@ target_sources(MoReFEMTestNonLinearMembrane_lib
)
target_link_libraries(MoReFEMTestNonLinearMembrane_lib
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_PARAM_INSTANCES}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_executable(MoReFEMTestNonLinearMembrane ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
......
......@@ -15,10 +15,7 @@ add_executable(MoReFEMTestHyperelasticOperator
)
target_link_libraries(MoReFEMTestHyperelasticOperator
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(HyperelasticOperator MoReFEMTestHyperelasticOperator
--
......
......@@ -11,29 +11,16 @@ add_executable(MoReFEMTestSolidPoissonWithoutYoung
${CMAKE_CURRENT_LIST_DIR}/test_poisson_without_young.cpp)
target_link_libraries(MoReFEMTestSolidAllDefined
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_PARAM_INSTANCES}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
target_link_libraries(MoReFEMTestSolidLameIgnored
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_PARAM_INSTANCES}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
target_link_libraries(MoReFEMTestSolidNoKappaMuC
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_PARAM_INSTANCES}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
target_link_libraries(MoReFEMTestSolidPoissonWithoutYoung
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_PARAM_INSTANCES}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
add_test(SolidAllDefined
MoReFEMTestSolidAllDefined
......
......@@ -3,10 +3,7 @@ add_executable(MoReFEMTestMpiGather
)
target_link_libraries(MoReFEMTestMpiGather
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools
${MOREFEM_TEST_TOOLS}
)
add_test(MpiGather
......
......@@ -3,10 +3,7 @@ add_executable(MoReFEMTestMpiSendReceive
)
target_link_libraries(MoReFEMTestMpiSendReceive
${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}
MoReFEM_test_tools)
${MOREFEM_TEST_TOOLS})
morefem_install( MoReFEMTestMpiSendReceive)
......
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