diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index 3718d96ca..346b80ab3 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -12,7 +12,49 @@ SET(FUNCTION_BIN_DIR ${MO_BIN_DIR}/tutorial/examples/function CACHE PATH "FUNCTI ###################################################################################### ###################################################################################### -### 2) Where must cmake go now ? +### 2) How to manage copy of benchs ? +###################################################################################### + +IF(ENABLE_CMAKE_COPY) + EXECUTE_PROCESS( + 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 + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + 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 + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson1/param + ${MO_BIN_DIR}/tutorial/Lesson1/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson2/param + ${MO_BIN_DIR}/tutorial/Lesson2/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson3/param + ${MO_BIN_DIR}/tutorial/Lesson3/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson4/param + ${MO_BIN_DIR}/tutorial/Lesson4/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson5/param + ${MO_BIN_DIR}/tutorial/Lesson5/param + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/Lesson6/param + ${MO_BIN_DIR}/tutorial/Lesson6/param + ) +ENDIF(ENABLE_CMAKE_COPY) + +###################################################################################### +### 3) Where must cmake go now ? ###################################################################################### #SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 Lesson6) @@ -25,69 +67,106 @@ ADD_SUBDIRECTORY(Lesson5) ADD_SUBDIRECTORY(Lesson6) +###################################################################################### +### 4) Target to copy benchs and parameters file ###################################################################################### +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 +) -ADD_CUSTOM_TARGET(install DEPENDS ${MO_SRC_DIR}/tutorial/examples/tsp/benchs - ${MO_SRC_DIR}/tutorial/Lesson1/param - ${MO_SRC_DIR}/tutorial/Lesson2/param - ${MO_SRC_DIR}/tutorial/Lesson3/param - ${MO_SRC_DIR}/tutorial/Lesson4/param - ${MO_SRC_DIR}/tutorial/Lesson5/param - ${MO_SRC_DIR}/tutorial/Lesson6/param ) +ADD_CUSTOM_TARGET(lesson1 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson1/param) + +ADD_CUSTOM_TARGET(lesson2 DEPENDS ${MO_BIN_DIR}/tutorial/Lesson2/param) + +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_CUSTOM_COMMAND( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_directory - ${MO_SRC_DIR}/tutorial/examples/tsp/benchs - ${MO_BIN_DIR}/tutorial/examples/tsp/benchs) + 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/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MO_SRC_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson1/param - ${MO_BIN_DIR}/tutorial/Lesson1) + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson2/param - ${MO_BIN_DIR}/tutorial/Lesson2) + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson3/param - ${MO_BIN_DIR}/tutorial/Lesson3) + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson4/param - ${MO_BIN_DIR}/tutorial/Lesson4) + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson5/param - ${MO_BIN_DIR}/tutorial/Lesson5) + 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( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${MO_SRC_DIR}/tutorial/Lesson6/param - ${MO_BIN_DIR}/tutorial/Lesson6) + 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 +) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index f522b0634..df61cdf06 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -23,7 +23,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(minimize_function minimize_function.cpp) +SOURCE_GROUP(src FILES + minimize_function.cpp + ${MO_BIN_DIR}/tutorial/Lesson1/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 +) + +ADD_EXECUTABLE(minimize_function + minimize_function.cpp + ${MO_BIN_DIR}/tutorial/Lesson1/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 +) 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 fc7baddb1..e17df4789 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -24,7 +24,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) +SOURCE_GROUP(src FILES + 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 +) + +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 +) 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 d33d78b7c..360113013 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -24,7 +24,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(tabu_search tabu_search.cpp) +SOURCE_GROUP(src FILES + 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 +) + +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 +) 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 9790bace6..cb735b198 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt @@ -24,7 +24,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) +SOURCE_GROUP(src FILES + 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 +) + +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 +) 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 6b83e5e48..41e33e2e2 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -24,7 +24,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) +SOURCE_GROUP(src FILES + 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 +) + +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 +) 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 c65ae30f0..5b90105cd 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt @@ -24,7 +24,25 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) ### 3) Define your target(s): just an executable here ###################################################################################### -ADD_EXECUTABLE(hybrid_ga hybrid_ga.cpp) +SOURCE_GROUP(src FILES + 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 +) + +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 +) ADD_DEPENDENCIES(hybrid_ga tsp)