diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index ed60e74f8..82cd2eb65 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -212,6 +212,14 @@ ADD_SUBDIRECTORY(Lesson6) ### 4) Target to copy benchs and parameters file ###################################################################################### -ADD_COMMANDS() -ADD_TARGET(install) -ADD_TARGET(benchs) +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/Lesson3/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index 0117e3837..f778798f4 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -24,58 +24,37 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_COMMANDS() -ADD_TARGET(lesson3) -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") + +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_COMMANDS() + ADD_TARGET(lesson3) + IF(ENABLE_CMAKE_EXAMPLE) 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") + ELSE(ENABLE_CMAKE_EXAMPLE) 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) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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 43a187136..00f1a6c73 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -23,58 +23,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_COMMANDS() -ADD_TARGET(lesson4) - -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) +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 + ) - 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 + ${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_COMMANDS() + ADD_TARGET(lesson4) + IF(ENABLE_CMAKE_EXAMPLE) 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") + ELSE(ENABLE_CMAKE_EXAMPLE) 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) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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 6f930d38b..1548f6294 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -24,58 +24,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_COMMANDS() -ADD_TARGET(lesson5) - -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") +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_COMMANDS() + ADD_TARGET(lesson5) + IF(ENABLE_CMAKE_EXAMPLE) 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") + ELSE(ENABLE_CMAKE_EXAMPLE) 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) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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 c6f4a448f..1a84a16a0 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -24,58 +24,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_COMMANDS() -ADD_TARGET(lesson6) - -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) +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 + ) - 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 + ${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_COMMANDS() + ADD_TARGET(lesson6) + IF(ENABLE_CMAKE_EXAMPLE) 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") + ELSE(ENABLE_CMAKE_EXAMPLE) 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) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ADD_DEPENDENCIES(hybrid_ga tsp)