nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1312 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-01-07 17:30:18 +00:00
commit 7d5156c64d
5 changed files with 119 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

14
branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt
View file

@ -212,6 +212,14 @@ ADD_SUBDIRECTORY(Lesson6)
### 4) Target to copy benchs and parameters file ### 4) Target to copy benchs and parameters file
###################################################################################### ######################################################################################
ADD_COMMANDS() IF(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" AND NOT CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_TARGET(install) ADD_COMMANDS()
ADD_TARGET(benchs) 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")

73
branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
View file

@ -24,58 +24,37 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 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 IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
${TSP_BIN_DIR}/benchs/berlin52.tsp SOURCE_GROUP(src FILES tabu_search.cpp)
${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 SOURCE_GROUP(benchs FILES
tabu_search.cpp ${TSP_BIN_DIR}/benchs/berlin52.tsp
${MO_BIN_DIR}/tutorial/Lesson3/param ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/berlin52.tsp ${TSP_BIN_DIR}/benchs/pr2392.tsp
${TSP_BIN_DIR}/benchs/eil101.tsp ${TSP_BIN_DIR}/benchs/rl5915.tsp
${TSP_BIN_DIR}/benchs/pr2392.tsp ${TSP_BIN_DIR}/benchs/usa13509.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp )
${TSP_BIN_DIR}/benchs/usa13509.tsp
) ADD_EXECUTABLE(tabu_search
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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) 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)
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) 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) ADD_DEPENDENCIES(tabu_search tsp)
###################################################################################### ######################################################################################

73
branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
View file

@ -23,58 +23,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
ADD_COMMANDS() IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_TARGET(lesson4) SOURCE_GROUP(src FILES simulated_annealing.cpp)
IF(ENABLE_CMAKE_EXAMPLE) SOURCE_GROUP(benchs FILES
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ${TSP_BIN_DIR}/benchs/berlin52.tsp
SOURCE_GROUP(src FILES simulated_annealing.cpp) ${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 ADD_EXECUTABLE(simulated_annealing
${TSP_BIN_DIR}/benchs/berlin52.tsp simulated_annealing.cpp
${TSP_BIN_DIR}/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/Lesson4/param
${TSP_BIN_DIR}/benchs/pr2392.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/usa13509.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 ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
${MO_BIN_DIR}/tutorial/Lesson4/param ADD_COMMANDS()
${TSP_BIN_DIR}/benchs/berlin52.tsp ADD_TARGET(lesson4)
${TSP_BIN_DIR}/benchs/eil101.tsp IF(ENABLE_CMAKE_EXAMPLE)
${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) 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)
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) 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) ADD_DEPENDENCIES(simulated_annealing tsp)
###################################################################################### ######################################################################################

73
branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
View file

@ -24,58 +24,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
ADD_COMMANDS() IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_TARGET(lesson5) SOURCE_GROUP(src FILES iterated_local_search.cpp)
IF(ENABLE_CMAKE_EXAMPLE) SOURCE_GROUP(benchs FILES
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ${TSP_BIN_DIR}/benchs/berlin52.tsp
SOURCE_GROUP(src FILES iterated_local_search.cpp) ${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 ADD_EXECUTABLE(iterated_local_search
${TSP_BIN_DIR}/benchs/berlin52.tsp iterated_local_search.cpp
${TSP_BIN_DIR}/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/Lesson5/param
${TSP_BIN_DIR}/benchs/pr2392.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/usa13509.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 ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
${MO_BIN_DIR}/tutorial/Lesson5/param ADD_COMMANDS()
${TSP_BIN_DIR}/benchs/berlin52.tsp ADD_TARGET(lesson5)
${TSP_BIN_DIR}/benchs/eil101.tsp IF(ENABLE_CMAKE_EXAMPLE)
${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) 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)
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) 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) ADD_DEPENDENCIES(iterated_local_search tsp)

73
branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt
View file

@ -24,58 +24,35 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
ADD_COMMANDS() IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_TARGET(lesson6) SOURCE_GROUP(src FILES hybrid_ga.cpp)
IF(ENABLE_CMAKE_EXAMPLE) SOURCE_GROUP(benchs FILES
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ${TSP_BIN_DIR}/benchs/berlin52.tsp
SOURCE_GROUP(src FILES hybrid_ga.cpp) ${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 ADD_EXECUTABLE(hybrid_ga
${TSP_BIN_DIR}/benchs/berlin52.tsp hybrid_ga.cpp
${TSP_BIN_DIR}/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/Lesson6/param
${TSP_BIN_DIR}/benchs/pr2392.tsp ${TSP_BIN_DIR}/benchs/berlin52.tsp
${TSP_BIN_DIR}/benchs/rl5915.tsp ${TSP_BIN_DIR}/benchs/eil101.tsp
${TSP_BIN_DIR}/benchs/usa13509.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 ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
${MO_BIN_DIR}/tutorial/Lesson6/param ADD_COMMANDS()
${TSP_BIN_DIR}/benchs/berlin52.tsp ADD_TARGET(lesson6)
${TSP_BIN_DIR}/benchs/eil101.tsp IF(ENABLE_CMAKE_EXAMPLE)
${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) 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)
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) 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) ADD_DEPENDENCIES(hybrid_ga tsp)