From 5e4c723b77d044f11333de60e40781dc66fb885f Mon Sep 17 00:00:00 2001 From: jhumeau Date: Wed, 7 Jan 2009 15:52:45 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1310 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutorial/Lesson1/CMakeLists.txt | 39 ++++------ .../tutorial/Lesson2/CMakeLists.txt | 76 +++++++------------ 2 files changed, 42 insertions(+), 73 deletions(-) diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index 4f9f34e6e..016f5b09c 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -22,30 +22,21 @@ 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(ENABLE_CMAKE_EXAMPLE) - IF(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 - 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 minimize_function.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 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) +IF(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 + 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_COMMANDS() + ADD_TARGET(lesson1) + IF(ENABLE_CMAKE_EXAMPLE) + ADD_EXECUTABLE(minimize_function minimize_function.cpp) + ELSE(ENABLE_CMAKE_EXAMPLE) + ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL minimize_function.cpp) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") 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 e7a9f63e1..82b56ddc3 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -24,58 +24,36 @@ 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(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) +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 + ) - 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 - 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 + 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_COMMANDS() + ADD_TARGET(lesson2) + IF(ENABLE_CMAKE_EXAMPLE) 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) - 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") + ELSE(ENABLE_CMAKE_EXAMPLE) 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) ######################################################################################