From b92780dbf3d55e26c3d0eb71f56dbcdf50501ecf Mon Sep 17 00:00:00 2001 From: legrand Date: Thu, 20 Mar 2008 15:25:33 +0000 Subject: [PATCH] deleted start/stop tests from linking git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1177 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-peo/test/CMakeLists.txt | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tags/paradiseo-1.1-patch1/paradiseo-peo/test/CMakeLists.txt b/tags/paradiseo-1.1-patch1/paradiseo-peo/test/CMakeLists.txt index 00a9be6dc..92ac9fe41 100644 --- a/tags/paradiseo-1.1-patch1/paradiseo-peo/test/CMakeLists.txt +++ b/tags/paradiseo-1.1-patch1/paradiseo-peo/test/CMakeLists.txt @@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE(CheckLibraryExists) SET (CMAKE_CXX_COMPILER mpicxx) + ADD_CUSTOM_TARGET(install ALL DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/test/param ${ParadisEO-PEO_SOURCE_DIR}/test/schema.xml) ADD_CUSTOM_COMMAND( TARGET install @@ -74,18 +75,23 @@ ENDFOREACH (test) IF(ENABLE_MINIMAL_CMAKE_TESTING) SET (MIN_TEST_LIST t-MultiStart) - FOREACH (test ${TEST_RUN}) - ADD_TEST(${test} ${test}) - ENDFOREACH (test) + + FOREACH (testrun ${TEST_RUN}) + ADD_EXECUTABLE(${testrun} ${T_${testrun}_SOURCES}) + ADD_TEST(${testrun} ${testrun}) + ENDFOREACH (testrun) + FOREACH (mintest ${MIN_TEST_LIST}) SET ("T_${mintest}_SOURCES" "${mintest}.cpp") ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) ADD_TEST(${mintest} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${mintest}" "@param") TARGET_LINK_LIBRARIES(${mintest} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) ENDFOREACH (mintest) - FOREACH (test ${TEST_STOP}) - ADD_TEST(${test} ${test}) - ENDFOREACH (test) + + FOREACH (teststop ${TEST_STOP}) + ADD_EXECUTABLE(${teststop} ${T_${teststop}_SOURCES}) + ADD_TEST(${teststop} ${teststop}) + ENDFOREACH (teststop) ELSEIF(ENABLE_CMAKE_TESTING) @@ -93,20 +99,19 @@ ELSEIF(ENABLE_CMAKE_TESTING) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ENDFOREACH (test) - FOREACH (test ${TEST_RUN}) - ADD_TEST(${test} ${test}) - ENDFOREACH (test) + FOREACH (testrun ${TEST_RUN}) + ADD_TEST(${testrun} ${testrun}) + ENDFOREACH (testrun) FOREACH (test ${TEST_LIST}) ADD_TEST(${test} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${test}" "@param") ENDFOREACH (test) - FOREACH (test ${TEST_STOP}) - ADD_TEST(${test} ${test}) - ENDFOREACH (test) + FOREACH (teststop ${TEST_STOP}) + ADD_TEST(${teststop} ${teststop}) + ENDFOREACH (teststop) - # Link the librairies - FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP}) + FOREACH (test ${TEST_LIST}) TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) ENDFOREACH (test)