diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index d8e7a441f..c7c7b2817 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -58,30 +58,17 @@ ENDIF(ENABLE_CMAKE_COPY) ### 3) Where must cmake go now ? ###################################################################################### -#SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 Lesson6) -ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(Lesson1) -ADD_SUBDIRECTORY(Lesson2) -ADD_SUBDIRECTORY(Lesson3) -ADD_SUBDIRECTORY(Lesson4) -ADD_SUBDIRECTORY(Lesson5) -ADD_SUBDIRECTORY(Lesson6) - - -###################################################################################### -### 4) Target to copy benchs and parameters file -###################################################################################### - -ADD_CUSTOM_COMMAND( - OUTPUT +MACRO(ADD_COMMANDS) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp @@ -94,80 +81,141 @@ ADD_CUSTOM_COMMAND( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp -) - -ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/param - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson1 -) - -ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson2/param - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson2 -) - -ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson3/param - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson3 -) - -ADD_CUSTOM_COMMAND( + ) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/Lesson1/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson1/param + ${MO_BIN_DIR}/tutorial/Lesson1 + ) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/Lesson2/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson2/param + ${MO_BIN_DIR}/tutorial/Lesson2 + ) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/Lesson3/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson3/param + ${MO_BIN_DIR}/tutorial/Lesson3 + ) + ADD_CUSTOM_COMMAND( OUTPUT ${MO_BIN_DIR}/tutorial/Lesson4/param COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MO_SRC_DIR}/tutorial/Lesson4/param ${MO_BIN_DIR}/tutorial/Lesson4 -) + ) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/Lesson5/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson5/param + ${MO_BIN_DIR}/tutorial/Lesson5 + ) + ADD_CUSTOM_COMMAND( + OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson6/param + ${MO_BIN_DIR}/tutorial/Lesson6 + ) +ENDMACRO(ADD_COMMANDS) -ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson5/param - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson5 -) -ADD_CUSTOM_COMMAND( - OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson6/param - ${MO_BIN_DIR}/tutorial/Lesson6 -) -ADD_CUSTOM_TARGET(install DEPENDS - ${MO_BIN_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson6/param - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp -) - -ADD_CUSTOM_TARGET(benchs DEPENDS - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp -) +MACRO(ADD_TARGET n) + IF(${n} STREQUAL "lesson1") + ADD_CUSTOM_TARGET(lesson1 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson1/param + ${MO_BIN_DIR}/tutorial/Lesson1/minimize_function + ) + ELSEIF(${n} STREQUAL "lesson2") + ADD_CUSTOM_TARGET(lesson2 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson2/param + ${MO_BIN_DIR}/tutorial/Lesson2/hill_climbing + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "lesson3") + ADD_CUSTOM_TARGET(lesson3 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson3/param + ${MO_BIN_DIR}/tutorial/Lesson3/tabu_search + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "lesson4") + ADD_CUSTOM_TARGET(lesson4 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson4/param + ${MO_BIN_DIR}/tutorial/Lesson4/simulated_annealing + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "lesson5") + ADD_CUSTOM_TARGET(lesson5 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${MO_BIN_DIR}/tutorial/Lesson5/iterated_local_search + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "lesson6") + ADD_CUSTOM_TARGET(lesson6 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson6/param + ${MO_BIN_DIR}/tutorial/Lesson6/hybrid_ga + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "install") + ADD_CUSTOM_TARGET(install DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson1/param + ${MO_BIN_DIR}/tutorial/Lesson2/param + ${MO_BIN_DIR}/tutorial/Lesson3/param + ${MO_BIN_DIR}/tutorial/Lesson4/param + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${MO_BIN_DIR}/tutorial/Lesson6/param + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ELSEIF(${n} STREQUAL "benchs") + ADD_CUSTOM_TARGET(benchs DEPENDS + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) + ENDIF(${n} STREQUAL "lesson1") +ENDMACRO(ADD_TARGET) -ADD_CUSTOM_TARGET(lesson1 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson1/param) +#SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 Lesson6) +ADD_SUBDIRECTORY(examples) +ADD_SUBDIRECTORY(Lesson1) +ADD_SUBDIRECTORY(Lesson2) +ADD_SUBDIRECTORY(Lesson3) +ADD_SUBDIRECTORY(Lesson4) +ADD_SUBDIRECTORY(Lesson5) +ADD_SUBDIRECTORY(Lesson6) -ADD_CUSTOM_TARGET(lesson2 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson2/param) +###################################################################################### +### 4) Target to copy benchs and parameters file +###################################################################################### -ADD_CUSTOM_TARGET(lesson3 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson3/param) - -ADD_CUSTOM_TARGET(lesson4 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson4/param) - -ADD_CUSTOM_TARGET(lesson5 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson5/param) - -ADD_CUSTOM_TARGET(lesson6 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson6/param) +ADD_COMMANDS() +ADD_TARGET(install) +ADD_TARGET(benchs) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index f9343d3e9..a46deb8ec 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -18,11 +18,13 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib) ###################################################################################### - ###################################################################################### ### 3) Define your target(s): just an executable here ###################################################################################### +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) @@ -31,7 +33,7 @@ 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_EXECUTABLE(minimize_function minimize_function.cpp) + 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") ADD_DEPENDENCIES(minimize_function function) @@ -40,10 +42,13 @@ ADD_DEPENDENCIES(minimize_function function) + + ###################################################################################### ### 4) Optionnal: define your target(s)'s version: no effect for windows ###################################################################################### + SET(MINIMIZEFUNCTION_VERSION ${GLOBAL_VERSION}) SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_VERSION}") ###################################################################################### diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt index 3e22f3ee3..000770415 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -24,6 +24,9 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### +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) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index d91f7063a..35ca19209 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -24,6 +24,9 @@ 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") SOURCE_GROUP(src FILES tabu_search.cpp) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt index 9572bff79..ad25e25c1 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -24,6 +24,9 @@ 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") SOURCE_GROUP(src FILES simulated_annealing.cpp) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt index c3055d60f..a7a20f2da 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -23,6 +23,10 @@ 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") SOURCE_GROUP(src FILES iterated_local_search.cpp) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt index 57ed6cb9d..554805fbc 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -23,6 +23,10 @@ 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") SOURCE_GROUP(src FILES hybrid_ga.cpp)