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@1310 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-01-07 15:52:45 +00:00
commit 5e4c723b77
2 changed files with 42 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,30 +22,21 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_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(lesson1) SOURCE_GROUP(src FILES minimize_function.cpp)
ADD_EXECUTABLE(minimize_function
IF(ENABLE_CMAKE_EXAMPLE) minimize_function.cpp
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ${MO_BIN_DIR}/tutorial/Lesson1/param
SOURCE_GROUP(src FILES minimize_function.cpp) )
ADD_EXECUTABLE(minimize_function ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
minimize_function.cpp ADD_COMMANDS()
${MO_BIN_DIR}/tutorial/Lesson1/param ADD_TARGET(lesson1)
) IF(ENABLE_CMAKE_EXAMPLE)
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 minimize_function.cpp) ELSE(ENABLE_CMAKE_EXAMPLE)
ENDIF(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)
ELSE(ENABLE_CMAKE_EXAMPLE) ENDIF(ENABLE_CMAKE_EXAMPLE)
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") ENDIF(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) ADD_DEPENDENCIES(minimize_function function)

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

@ -24,58 +24,36 @@ 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(lesson2) SOURCE_GROUP(src FILES hill_climbing.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 hill_climbing.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(hill_climbing
${TSP_BIN_DIR}/benchs/berlin52.tsp hill_climbing.cpp
${TSP_BIN_DIR}/benchs/eil101.tsp ${MO_BIN_DIR}/tutorial/Lesson2/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(hill_climbing )
hill_climbing.cpp ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
${MO_BIN_DIR}/tutorial/Lesson2/param ADD_COMMANDS()
${TSP_BIN_DIR}/benchs/berlin52.tsp ADD_TARGET(lesson2)
${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(hill_climbing hill_climbing.cpp) 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)
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) 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)
ENDIF(ENABLE_CMAKE_EXAMPLE) ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
ADD_DEPENDENCIES(hill_climbing tsp) ADD_DEPENDENCIES(hill_climbing tsp)
###################################################################################### ######################################################################################