From f3a4fd20300d945ff526a35dc2f6b07d325b1903 Mon Sep 17 00:00:00 2001 From: legrand Date: Tue, 18 Mar 2008 15:19:58 +0000 Subject: [PATCH] adapted new minimal ctest config git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1169 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-peo/test/CMakeLists.txt | 28 ++----------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt index 0c5c6c878..00a9be6dc 100644 --- a/trunk/paradiseo-peo/test/CMakeLists.txt +++ b/trunk/paradiseo-peo/test/CMakeLists.txt @@ -80,8 +80,8 @@ IF(ENABLE_MINIMAL_CMAKE_TESTING) FOREACH (mintest ${MIN_TEST_LIST}) SET ("T_${mintest}_SOURCES" "${mintest}.cpp") ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) - ADD_TEST(${mintest} ${mintest}) - TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) + 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}) @@ -112,28 +112,4 @@ ELSEIF(ENABLE_CMAKE_TESTING) ENDIF(ENABLE_MINIMAL_CMAKE_TESTING) - ###################################################################################### - - -###################################################################################### -### 5) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - - -