From 296cb64f6fd67e54b442d944561766d878b5eec0 Mon Sep 17 00:00:00 2001 From: jhumeau Date: Tue, 6 Jan 2009 17:16:58 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1309 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-mo/tutorial/CMakeLists.txt | 6 +- .../tutorial/Lesson1/CMakeLists.txt | 31 +++++--- .../tutorial/Lesson2/CMakeLists.txt | 70 ++++++++++++------ .../tutorial/Lesson3/CMakeLists.txt | 72 +++++++++++++------ .../tutorial/Lesson4/CMakeLists.txt | 71 ++++++++++++------ .../tutorial/Lesson5/CMakeLists.txt | 72 +++++++++++++------ .../tutorial/Lesson6/CMakeLists.txt | 70 ++++++++++++------ 7 files changed, 265 insertions(+), 127 deletions(-) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index e4fc2f8ad..a54d0b5e3 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -16,7 +16,7 @@ SET(FUNCTION_BIN_DIR ${MO_BIN_DIR}/tutorial/examples/function CACHE PATH "FUNCTI ###################################################################################### -IF(ENABLE_CMAKE_COPY) +IF(ENABLE_CMAKE_EXAMPLE) SET(BENCH_LIST berlin52.tsp eil101.tsp @@ -52,7 +52,7 @@ IF(ENABLE_CMAKE_COPY) ${MO_SRC_DIR}/tutorial/Lesson6/param ${MO_BIN_DIR}/tutorial/Lesson6/param ) -ENDIF(ENABLE_CMAKE_COPY) +ENDIF(ENABLE_CMAKE_EXAMPLE) ###################################################################################### ### 3) Where must cmake go now ? @@ -120,8 +120,6 @@ MACRO(ADD_COMMANDS) ) ENDMACRO(ADD_COMMANDS) - - MACRO(ADD_TARGET n) IF(${n} STREQUAL "lesson1") ADD_CUSTOM_TARGET(lesson1 DEPENDS diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index a46deb8ec..4f9f34e6e 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -25,16 +25,27 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson1) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES minimize_function.cpp) - - ADD_EXECUTABLE(minimize_function - minimize_function.cpp - ${MO_BIN_DIR}/tutorial/Lesson1/param - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL minimize_function.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES minimize_function.cpp) + ADD_EXECUTABLE(minimize_function + minimize_function.cpp + ${MO_BIN_DIR}/tutorial/Lesson1/param + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(minimize_function minimize_function.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES minimize_function.cpp) + ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL + minimize_function.cpp + ${MO_BIN_DIR}/tutorial/Lesson1/param + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL minimize_function.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(minimize_function function) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt index 000770415..e7a9f63e1 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -27,29 +27,55 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson2) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES hill_climbing.cpp) - - SOURCE_GROUP(benchs FILES - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES hill_climbing.cpp) - ADD_EXECUTABLE(hill_climbing - hill_climbing.cpp - ${MO_BIN_DIR}/tutorial/Lesson2/param - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(hill_climbing + hill_climbing.cpp + ${MO_BIN_DIR}/tutorial/Lesson2/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES hill_climbing.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL + hill_climbing.cpp + ${MO_BIN_DIR}/tutorial/Lesson2/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL hill_climbing.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(hill_climbing tsp) ###################################################################################### diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index 35ca19209..0117e3837 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -27,29 +27,55 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson3) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES tabu_search.cpp) - - SOURCE_GROUP(benchs FILES - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) - - ADD_EXECUTABLE(tabu_search - tabu_search.cpp - ${MO_BIN_DIR}/tutorial/Lesson3/param - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(tabu_search tabu_search.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES tabu_search.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(tabu_search + tabu_search.cpp + ${MO_BIN_DIR}/tutorial/Lesson3/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(tabu_search tabu_search.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES tabu_search.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL + tabu_search.cpp + ${MO_BIN_DIR}/tutorial/Lesson3/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL tabu_search.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(tabu_search tsp) ###################################################################################### diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt index ad25e25c1..43a187136 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -1,5 +1,4 @@ - ###################################################################################### ### 1) Include the sources ###################################################################################### @@ -27,29 +26,55 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson4) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES simulated_annealing.cpp) - - SOURCE_GROUP(benchs FILES - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES simulated_annealing.cpp) - ADD_EXECUTABLE(simulated_annealing - simulated_annealing.cpp - ${MO_BIN_DIR}/tutorial/Lesson4/param - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(simulated_annealing + simulated_annealing.cpp + ${MO_BIN_DIR}/tutorial/Lesson4/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES simulated_annealing.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL + simulated_annealing.cpp + ${MO_BIN_DIR}/tutorial/Lesson4/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL simulated_annealing.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(simulated_annealing tsp) ###################################################################################### diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt index a7a20f2da..6f930d38b 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -27,29 +27,55 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson5) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES iterated_local_search.cpp) - - SOURCE_GROUP(benchs FILES - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) - - ADD_EXECUTABLE(iterated_local_search - iterated_local_search.cpp - ${MO_BIN_DIR}/tutorial/Lesson5/param - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES iterated_local_search.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(iterated_local_search + iterated_local_search.cpp + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES iterated_local_search.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL + iterated_local_search.cpp + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL iterated_local_search.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(iterated_local_search tsp) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt index 554805fbc..c6f4a448f 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -27,29 +27,55 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ADD_COMMANDS() ADD_TARGET(lesson6) -IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - SOURCE_GROUP(src FILES hybrid_ga.cpp) - - SOURCE_GROUP(benchs FILES - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) +IF(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES hybrid_ga.cpp) - ADD_EXECUTABLE(hybrid_ga - hybrid_ga.cpp - ${MO_BIN_DIR}/tutorial/Lesson6/param - ${TSP_BIN_DIR}/benchs/berlin52.tsp - ${TSP_BIN_DIR}/benchs/eil101.tsp - ${TSP_BIN_DIR}/benchs/pr2392.tsp - ${TSP_BIN_DIR}/benchs/rl5915.tsp - ${TSP_BIN_DIR}/benchs/usa13509.tsp - ) -ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") - ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) -ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(hybrid_ga + hybrid_ga.cpp + ${MO_BIN_DIR}/tutorial/Lesson6/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ELSE(ENABLE_CMAKE_EXAMPLE) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES hybrid_ga.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(hybrid_ga EXCLUDE_FROM_ALL + hybrid_ga.cpp + ${MO_BIN_DIR}/tutorial/Lesson6/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_EXECUTABLE(hybrid_ga EXCLUDE_FROM_ALL hybrid_ga.cpp) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") +ENDIF(ENABLE_CMAKE_EXAMPLE) ADD_DEPENDENCIES(hybrid_ga tsp)