#1398 Attempt to fix compilation issue with static libraries: making test...

#1398 Attempt to fix compilation issue with static libraries: making test tools libraries build directly upon MoReFEM one led to multiple symbols. Changes work in macOS but remains to be checked on Linux ones.

MoReFEM.xcodeproj/project.pbxproj

@@ -3554,6 +3554,29 @@
 		BE469F081A49B5B6008C9B68 /* UnknownInformation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = UnknownInformation.hpp; sourceTree = "<group>"; };
 		BE469F091A49B5B6008C9B68 /* UnknownInformation.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = UnknownInformation.hxx; sourceTree = "<group>"; };
 		BE48C0AE1AD3BE6300D2B076 /* DofComputations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DofComputations.cpp; sourceTree = "<group>"; };
+		BE49076F225D0D69000C212B /* SourceList.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceList.cmake; sourceTree = "<group>"; };
+		BE490771225D27D3000C212B /* ExpectedResults.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ExpectedResults.hxx; sourceTree = "<group>"; };
+		BE490772225D27D3000C212B /* VariationalFormulation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VariationalFormulation.cpp; sourceTree = "<group>"; };
+		BE490773225D27D3000C212B /* VariationalFormulation.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulation.hxx; sourceTree = "<group>"; };
+		BE490774225D27D3000C212B /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		BE490775225D27D3000C212B /* ExpectedResults.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpectedResults.cpp; sourceTree = "<group>"; };
+		BE490776225D27D3000C212B /* demo_input_parameter_test_functions_2D.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_input_parameter_test_functions_2D.lua; sourceTree = "<group>"; };
+		BE490777225D27D3000C212B /* ExpectedResults_1D.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpectedResults_1D.cpp; sourceTree = "<group>"; };
+		BE490778225D27D3000C212B /* demo_input_parameter_test_functions_3D.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_input_parameter_test_functions_3D.lua; sourceTree = "<group>"; };
+		BE490779225D27D3000C212B /* Model.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Model.hpp; sourceTree = "<group>"; };
+		BE49077A225D27D3000C212B /* InputData.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InputData.hpp; sourceTree = "<group>"; };
+		BE49077B225D27D3000C212B /* main.cpp.keep */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.cpp.keep; sourceTree = "<group>"; };
+		BE49077C225D27D3000C212B /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+		BE49077D225D27D3000C212B /* Model.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Model.hxx; sourceTree = "<group>"; };
+		BE49077E225D27D3000C212B /* ExpectedResults_2D.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpectedResults_2D.cpp; sourceTree = "<group>"; };
+		BE49077F225D27D3000C212B /* main.cpp.bck */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.cpp.bck; sourceTree = "<group>"; };
+		BE490780225D27D3000C212B /* demo_input_parameter_test_functions_1D.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_input_parameter_test_functions_1D.lua; sourceTree = "<group>"; };
+		BE490781225D27D3000C212B /* ExpectedResults_3D.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpectedResults_3D.cpp; sourceTree = "<group>"; };
+		BE490782225D27D3000C212B /* Model.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Model.cpp; sourceTree = "<group>"; };
+		BE490783225D27D3000C212B /* VariationalFormulation.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = VariationalFormulation.hpp; sourceTree = "<group>"; };
+		BE490784225D27D3000C212B /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
+		BE490785225D27D3000C212B /* VariationalFormulationInit.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VariationalFormulationInit.cpp; sourceTree = "<group>"; };
+		BE490786225D27D3000C212B /* ExpectedResults.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ExpectedResults.hpp; sourceTree = "<group>"; };
 		BE4940FF224250E800157863 /* FiberDensityJ1J4J6.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FiberDensityJ1J4J6.hpp; sourceTree = "<group>"; };
 		BE494100224250E800157863 /* FiberDensityJ1J4J6.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FiberDensityJ1J4J6.hxx; sourceTree = "<group>"; };
 		BE494101224250E800157863 /* FiberDensityJ1J4J6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FiberDensityJ1J4J6.cpp; sourceTree = "<group>"; };
@@ -5097,6 +5120,7 @@
 				135F215D1E7ADBC000B9E633 /* GlobalVariationalOperator */,
 				135F21731E7ADBC000B9E633 /* LocalVariationalOperator */,
 				135F21461E7ADBC000B9E633 /* ConformInterpolator */,
+				BE490770225D27D3000C212B /* TestFunctions */,
 				135F21AE1E7ADBC000B9E633 /* ParameterOperator */,
 				135F21A61E7ADBC000B9E633 /* Miscellaneous */,
 			);
@@ -6770,6 +6794,7 @@
 		BE451E381DAF78F100807035 /* ParameterInstances */ = {
 			isa = PBXGroup;
 			children = (
+				BE49076F225D0D69000C212B /* SourceList.cmake */,
 				BE5891181E1526A30075B046 /* ParameterInstances.doxygen */,
 				BEC180951DAFCE8900ACC8FE /* FromParameterAtDof */,
 				BE451E5E1DAF78F100807035 /* ThreeDimensionalParameter */,
@@ -7079,6 +7104,36 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
+		BE490770225D27D3000C212B /* TestFunctions */ = {
+			isa = PBXGroup;
+			children = (
+				BE490771225D27D3000C212B /* ExpectedResults.hxx */,
+				BE490772225D27D3000C212B /* VariationalFormulation.cpp */,
+				BE490773225D27D3000C212B /* VariationalFormulation.hxx */,
+				BE490774225D27D3000C212B /* CMakeLists.txt */,
+				BE490775225D27D3000C212B /* ExpectedResults.cpp */,
+				BE490776225D27D3000C212B /* demo_input_parameter_test_functions_2D.lua */,
+				BE490777225D27D3000C212B /* ExpectedResults_1D.cpp */,
+				BE490778225D27D3000C212B /* demo_input_parameter_test_functions_3D.lua */,
+				BE490779225D27D3000C212B /* Model.hpp */,
+				BE49077A225D27D3000C212B /* InputData.hpp */,
+				BE49077B225D27D3000C212B /* main.cpp.keep */,
+				BE49077C225D27D3000C212B /* README */,
+				BE49077D225D27D3000C212B /* Model.hxx */,
+				BE49077E225D27D3000C212B /* ExpectedResults_2D.cpp */,
+				BE49077F225D27D3000C212B /* main.cpp.bck */,
+				BE490780225D27D3000C212B /* demo_input_parameter_test_functions_1D.lua */,
+				BE490781225D27D3000C212B /* ExpectedResults_3D.cpp */,
+				BE490782225D27D3000C212B /* Model.cpp */,
+				BE490783225D27D3000C212B /* VariationalFormulation.hpp */,
+				BE490784225D27D3000C212B /* main.cpp */,
+				BE490785225D27D3000C212B /* VariationalFormulationInit.cpp */,
+				BE490786225D27D3000C212B /* ExpectedResults.hpp */,
+			);
+			name = TestFunctions;
+			path = Sources/Test/Operators/TestFunctions;
+			sourceTree = SOURCE_ROOT;
+		};
 		BE4D0C5821A2E4F800E0D4E7 /* Instances */ = {
 			isa = PBXGroup;
 			children = (

Sources/CMakeLists.txt

@@ -40,10 +40,6 @@ 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})
 
 include(Utilities/SourceList.cmake)
 include(ThirdParty/SourceList.cmake)

Sources/ModelInstances/Elasticity/CMakeLists.txt

@@ -88,6 +88,9 @@ morefem_install(MoReFEM4ElasticityEnsightOutput)
 
 add_executable(MoReFEM4ElasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4ElasticityCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4ElasticityCheckResults)

Sources/ModelInstances/Heat/CMakeLists.txt

@@ -33,6 +33,9 @@ morefem_install(MoReFEM4HeatEnsightOutput)
 
 add_executable(MoReFEM4HeatCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4HeatCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4HeatCheckResults)

Sources/ModelInstances/Hyperelasticity/CMakeLists.txt

@@ -32,6 +32,9 @@ morefem_install(MoReFEM4HyperelasticityEnsightOutput)
 
 add_executable(MoReFEM4HyperelasticityCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4HyperelasticityCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4HyperelasticityCheckResults)

Sources/ModelInstances/Laplacian/CMakeLists.txt

@@ -59,6 +59,9 @@ add_test(LaplacianModelEnsightOutput-mpi
 
 add_executable(MoReFEM4LaplacianCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4LaplacianCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4LaplacianCheckResults)

Sources/ModelInstances/RivlinCube/CMakeLists.txt

@@ -88,6 +88,9 @@ add_test(RivlinCubeModelEnsightOutputTetra-mpi
 
 add_executable(MoReFEM4RivlinCubeCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4RivlinCubeCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4RivlinCubeCheckResults)

Sources/ModelInstances/Stokes/CMakeLists.txt

@@ -56,6 +56,9 @@ add_test(StokesModelEnsightOutput-mpi
 
 add_executable(MoReFEM4StokesCheckResults ${CMAKE_CURRENT_LIST_DIR}/test_results.cpp)
 target_link_libraries(MoReFEM4StokesCheckResults
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_UTILITIES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 morefem_install(MoReFEM4StokesCheckResults)

Sources/Test/Operators/TestFunctions/CMakeLists.txt

@@ -17,4 +17,7 @@ add_executable(MoReFEMTestOperatorTestFunctions
               )
           
 target_link_libraries(MoReFEMTestOperatorTestFunctions
-                      MoReFEM_test_tools)
\ No newline at end of file
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_MODEL}
+                      ${ALL_LOAD_END_FLAG}
+                      MoReFEM_test_tools)

Sources/Test/Operators/VariationalInstances/NonlinearMembrane/CMakeLists.txt

@@ -14,7 +14,10 @@ target_sources(MoReFEMTestNonLinearMembrane_lib
 		"${CMAKE_CURRENT_LIST_DIR}/ExpectedResults.hpp"
 )
 
-target_link_libraries(MoReFEMTestNonLinearMembrane_lib                      
+target_link_libraries(MoReFEMTestNonLinearMembrane_lib
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_PARAM_INSTANCES}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 

Sources/Test/Operators/VariationalInstances/Pk2/CMakeLists.txt

@@ -15,6 +15,9 @@ add_executable(MoReFEMTestHyperelasticOperator
               )
           
 target_link_libraries(MoReFEMTestHyperelasticOperator
+                      ${ALL_LOAD_BEGIN_FLAG}
+                      ${MOREFEM_MODEL}
+                      ${ALL_LOAD_END_FLAG}
                       MoReFEM_test_tools)
 
 add_test(HyperelasticOperator MoReFEMTestHyperelasticOperator

Sources/Test/Tools/CMakeLists.txt

@@ -22,12 +22,3 @@ target_sources(MoReFEM_test_tools
 
 target_link_libraries(MoReFEM_test_tools ${LIB_BOOST_TEST})
 
-# 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()
-
-