From 37ac9b05a216dcb8c2c8ad0974a569422bbc677b Mon Sep 17 00:00:00 2001 From: legrand Date: Mon, 10 Mar 2008 14:24:38 +0000 Subject: [PATCH] changed dart server + set visual studio 9 specific tags + added coverage flags git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1105 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/install.cmake | 6 +++--- trunk/installParadiseo.sh | 2 +- trunk/paradiseo-mo/DartConfig.cmake | 2 +- trunk/paradiseo-moeo/DartConfig.cmake | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/install.cmake b/trunk/install.cmake index 95d491cf4..9ab8bad8b 100644 --- a/trunk/install.cmake +++ b/trunk/install.cmake @@ -62,19 +62,19 @@ ENDIF(NOT CMAKE_BUILD_TYPE) IF(WIN32 AND NOT CYGWIN) IF(CMAKE_CXX_COMPILER MATCHES cl) IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(NOT WITH_SHARED_LIBS) ENDIF(CMAKE_CXX_COMPILER MATCHES cl) ELSE(WIN32 AND NOT CYGWIN) IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall -Wextra") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fprofile-arcs -ftest-coverage -Wall -Wextra") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O6") ENDIF(CMAKE_COMPILER_IS_GNUCXX) diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh index 66b4e13d7..53d78bd38 100755 --- a/trunk/installParadiseo.sh +++ b/trunk/installParadiseo.sh @@ -33,7 +33,7 @@ DEFAULT_BUILD_TYPE=Release BUILD_TYPE=$DEFAULT_BUILD_TYPE # CMake/CTest/Dart flags -CTEST_DEFAULT_CONFIG="-D ExperimentalStart -D ExperimentalBuild -D ExperimentalCoverage" +CTEST_DEFAULT_CONFIG="-D ExperimentalStart -D ExperimentalBuild" CTEST_CONFIG=$CTEST_DEFAULT_CONFIG # install types to select in the main menu diff --git a/trunk/paradiseo-mo/DartConfig.cmake b/trunk/paradiseo-mo/DartConfig.cmake index c7d4bee30..49707a50a 100644 --- a/trunk/paradiseo-mo/DartConfig.cmake +++ b/trunk/paradiseo-mo/DartConfig.cmake @@ -4,7 +4,7 @@ ############################################################################# SET (DROP_METHOD "xmlrpc") -SET (DROP_SITE "http://dart.irisa.fr") +SET (DROP_SITE "http://dart-test.irisa.fr") SET (DROP_LOCATION "ParadisEO") SET (NIGHTLY_START_TIME "23:00:00 WEST") ############################################################################# \ No newline at end of file diff --git a/trunk/paradiseo-moeo/DartConfig.cmake b/trunk/paradiseo-moeo/DartConfig.cmake index 81b50969c..9c15a5362 100644 --- a/trunk/paradiseo-moeo/DartConfig.cmake +++ b/trunk/paradiseo-moeo/DartConfig.cmake @@ -4,7 +4,7 @@ ############################################################################# SET (DROP_METHOD "xmlrpc") -SET (DROP_SITE "http://dart.irisa.fr") +SET (DROP_SITE "http://dart-test.irisa.fr") SET (DROP_LOCATION "ParadisEO") SET (NIGHTLY_START_TIME "23:00:00 WEST") ############################################################################# \ No newline at end of file