Commit e05f2d8f authored by DIAZ Jerome's avatar DIAZ Jerome Committed by GILLES Sebastien

#1418 Modified the CMakelists used for the test so that the several libraries...

#1418 Modified the CMakelists used for the test so that the several libraries builds have the expected behaviour regarding the abstract factory idiom.
parent 1c10561f
add_executable(MoReFEMTestMicrosphereOperator add_library(MoReFEM4Microsphere_lib ${LIBRARY_TYPE} "")
${CMAKE_CURRENT_LIST_DIR}/InputData.hpp
${CMAKE_CURRENT_LIST_DIR}/Model.cpp target_sources(MoReFEM4Microsphere_lib
${CMAKE_CURRENT_LIST_DIR}/Model.hpp PRIVATE
${CMAKE_CURRENT_LIST_DIR}/Model.hxx "${CMAKE_CURRENT_LIST_DIR}/Model.cpp"
${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.cpp "${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.cpp"
${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.hpp PUBLIC
${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.hxx "${CMAKE_CURRENT_LIST_DIR}/InputData.hpp"
${CMAKE_CURRENT_LIST_DIR}/main.cpp "${CMAKE_CURRENT_LIST_DIR}/Model.hpp"
) "${CMAKE_CURRENT_LIST_DIR}/Model.hxx"
"${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.hpp"
target_link_libraries(MoReFEMTestMicrosphereOperator "${CMAKE_CURRENT_LIST_DIR}/VariationalFormulation.hxx")
target_link_libraries(MoReFEM4Microsphere_lib
${ALL_LOAD_BEGIN_FLAG} ${ALL_LOAD_BEGIN_FLAG}
${MOREFEM_MODEL} ${MOREFEM_MODEL}
${ALL_LOAD_END_FLAG}) ${ALL_LOAD_END_FLAG})
add_executable(MoReFEMTestMicrosphereOperator
${CMAKE_CURRENT_LIST_DIR}/main.cpp)
target_link_libraries(MoReFEMTestMicrosphereOperator
MoReFEM4Microsphere_lib)
add_executable(MoReFEMTestMicrosphereOperatorEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp) add_executable(MoReFEMTestMicrosphereOperatorEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEMTestMicrosphereOperatorEnsightOutput target_link_libraries(MoReFEMTestMicrosphereOperatorEnsightOutput
...@@ -30,7 +38,7 @@ add_test(MicrosphereOperator ...@@ -30,7 +38,7 @@ add_test(MicrosphereOperator
-i ${MOREFEM_ROOT}/Sources/Test/Operators/VariationalInstances/Microsphere/demo_microsphere.lua -i ${MOREFEM_ROOT}/Sources/Test/Operators/VariationalInstances/Microsphere/demo_microsphere.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq) -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
set_tests_properties(MicrosphereOperator PROPERTIES TIMEOUT 10) set_tests_properties(MicrosphereOperator PROPERTIES TIMEOUT 30)
add_test(MicrosphereOperator-mpi add_test(MicrosphereOperator-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun ${OPEN_MPI_INCL_DIR}/../bin/mpirun
...@@ -41,7 +49,7 @@ add_test(MicrosphereOperator-mpi ...@@ -41,7 +49,7 @@ add_test(MicrosphereOperator-mpi
-i ${MOREFEM_ROOT}/Sources/Test/Operators/VariationalInstances/Microsphere/demo_microsphere.lua -i ${MOREFEM_ROOT}/Sources/Test/Operators/VariationalInstances/Microsphere/demo_microsphere.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4) -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
set_tests_properties(MicrosphereOperator-mpi PROPERTIES TIMEOUT 10) set_tests_properties(MicrosphereOperator-mpi PROPERTIES TIMEOUT 30)
add_test(MicrosphereOperatorEnsightOutput add_test(MicrosphereOperatorEnsightOutput
MoReFEMTestMicrosphereOperatorEnsightOutput MoReFEMTestMicrosphereOperatorEnsightOutput
...@@ -49,7 +57,7 @@ add_test(MicrosphereOperatorEnsightOutput ...@@ -49,7 +57,7 @@ add_test(MicrosphereOperatorEnsightOutput
-i ${MOREFEM_TEST_OUTPUT_DIR}/Seq/Microsphere/Rank_0/input_data.lua -i ${MOREFEM_TEST_OUTPUT_DIR}/Seq/Microsphere/Rank_0/input_data.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq) -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
set_tests_properties(MicrosphereOperatorEnsightOutput PROPERTIES TIMEOUT 10) set_tests_properties(MicrosphereOperatorEnsightOutput PROPERTIES TIMEOUT 30)
add_test(MicrosphereOperatorEnsightOutput-mpi add_test(MicrosphereOperatorEnsightOutput-mpi
MoReFEMTestMicrosphereOperatorEnsightOutput MoReFEMTestMicrosphereOperatorEnsightOutput
...@@ -57,7 +65,7 @@ add_test(MicrosphereOperatorEnsightOutput-mpi ...@@ -57,7 +65,7 @@ add_test(MicrosphereOperatorEnsightOutput-mpi
-i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Microsphere/Rank_0/input_data.lua -i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Microsphere/Rank_0/input_data.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4) -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
set_tests_properties(MicrosphereOperatorEnsightOutput-mpi PROPERTIES TIMEOUT 10) set_tests_properties(MicrosphereOperatorEnsightOutput-mpi PROPERTIES TIMEOUT 30)
add_test(MicrosphereOperatorCheckResults add_test(MicrosphereOperatorCheckResults
MoReFEMTestMicrosphereOperatorCheckResults MoReFEMTestMicrosphereOperatorCheckResults
...@@ -66,4 +74,4 @@ add_test(MicrosphereOperatorCheckResults ...@@ -66,4 +74,4 @@ add_test(MicrosphereOperatorCheckResults
${MOREFEM_TEST_OUTPUT_DIR} ${MOREFEM_TEST_OUTPUT_DIR}
) )
set_tests_properties(MicrosphereOperatorCheckResults PROPERTIES TIMEOUT 10) set_tests_properties(MicrosphereOperatorCheckResults PROPERTIES TIMEOUT 30)
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