From 49d4cec250ef19d37906886d88e0ab6f5dfa11fc Mon Sep 17 00:00:00 2001 From: jhumeau Date: Thu, 8 Jan 2009 10:49:35 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1314 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-mo/tutorial/CMakeLists.txt | 30 +++++++------------ .../tutorial/Lesson1/CMakeLists.txt | 4 +-- .../tutorial/Lesson2/CMakeLists.txt | 4 +-- .../tutorial/Lesson3/CMakeLists.txt | 4 +-- .../tutorial/Lesson4/CMakeLists.txt | 4 +-- .../tutorial/Lesson5/CMakeLists.txt | 4 +-- .../tutorial/Lesson6/CMakeLists.txt | 4 +-- 7 files changed, 22 insertions(+), 32 deletions(-) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index 82cd2eb65..9513469dc 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -57,7 +57,7 @@ ENDIF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR ### 3) Where must cmake go now ? ###################################################################################### -MACRO(ADD_COMMANDS) +MACRO(ADD_COMMANDS_MO) ADD_CUSTOM_COMMAND( OUTPUT ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp @@ -117,9 +117,9 @@ MACRO(ADD_COMMANDS) ${MO_SRC_DIR}/tutorial/Lesson6/param ${MO_BIN_DIR}/tutorial/Lesson6 ) -ENDMACRO(ADD_COMMANDS) +ENDMACRO(ADD_COMMANDS_MO) -MACRO(ADD_TARGET n) +MACRO(ADD_TARGET_MO n) IF(${n} STREQUAL "lesson1") ADD_CUSTOM_TARGET(lesson1 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson1/param @@ -198,7 +198,13 @@ MACRO(ADD_TARGET n) ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) ENDIF(${n} STREQUAL "lesson1") -ENDMACRO(ADD_TARGET) +ENDMACRO(ADD_TARGET_MO) + +IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_COMMANDS_MO() + ADD_TARGET_MO(install) + ADD_TARGET_MO(benchs) +ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(Lesson1) @@ -207,19 +213,3 @@ ADD_SUBDIRECTORY(Lesson3) ADD_SUBDIRECTORY(Lesson4) ADD_SUBDIRECTORY(Lesson5) ADD_SUBDIRECTORY(Lesson6) - -###################################################################################### -### 4) Target to copy benchs and parameters file -###################################################################################### - -IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(install) - ADD_TARGET(benchs) - ADD_TARGET(lesson1) - ADD_TARGET(lesson2) - ADD_TARGET(lesson3) - ADD_TARGET(lesson4) - ADD_TARGET(lesson5) - ADD_TARGET(lesson6) -ENDIF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index 016f5b09c..1c0437cf1 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -29,8 +29,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${MO_BIN_DIR}/tutorial/Lesson1/param ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson1) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson1) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(minimize_function minimize_function.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt index 82b56ddc3..3f9b30a5f 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -45,8 +45,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson2) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson2) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index f778798f4..95380a214 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -47,8 +47,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson3) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson3) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(tabu_search tabu_search.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt index 00f1a6c73..c925f4117 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -44,8 +44,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson4) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson4) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt index 1548f6294..10b4b8b5e 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -45,8 +45,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson5) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson5) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) ELSE(ENABLE_CMAKE_EXAMPLE) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt index 1a84a16a0..6498517a8 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -45,8 +45,8 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL " ${TSP_BIN_DIR}/benchs/usa13509.tsp ) ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_COMMANDS() - ADD_TARGET(lesson6) + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson6) IF(ENABLE_CMAKE_EXAMPLE) ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) ELSE(ENABLE_CMAKE_EXAMPLE)