diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt index e7151538b..689edd330 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt @@ -1,18 +1,122 @@ + ###################################################################################### -### 0) Need lesson1 directory +### 1) Include the sources ###################################################################################### -SET(TUTORIAL_LESSON1_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) +INCLUDE_DIRECTORIES(${MO_SRC_DIR}) +INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) +###################################################################################### + + + +###################################################################################### +### 2) Specify where CMake can find the libraries (mandatory: before 3) ) +###################################################################################### + +# --> UNIX +IF(UNIX) + LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) + LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) + LINK_DIRECTORIES(${EO_LIB_DIR}\\release) + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) ###################################################################################### ###################################################################################### -### 1) Where must cmake go now ? +### 3) Define your target(s): just an executable here ###################################################################################### -SUBDIRS(src) +# no matter what is the OS, hopefully +ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) + +ADD_DEPENDENCIES(hill_climbing tsp) + +SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON1_DIR}/build) +###################################################################################### + + ###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(HILLCLIMBING_VERSION "1.0.beta") +SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}") +###################################################################################### + + + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +# --> UNIX +IF(UNIX) + TARGET_LINK_LIBRARIES(hill_climbing tsp) + TARGET_LINK_LIBRARIES(hill_climbing eo) + TARGET_LINK_LIBRARIES(hill_climbing eoutils) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + TARGET_LINK_LIBRARIES(hill_climbing tsp) + TARGET_LINK_LIBRARIES(hill_climbing eod) + TARGET_LINK_LIBRARIES(hill_climbing eoutilsd) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + TARGET_LINK_LIBRARIES(hill_climbing tsp) + TARGET_LINK_LIBRARIES(hill_climbing eo) + TARGET_LINK_LIBRARIES(hill_climbing eoutils) + ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) + MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) +###################################################################################### + + + +###################################################################################### +### 6) Windows advanced config - especially for Microsoft Visual Studio 8 +###################################################################################### + + IF(CMAKE_CXX_COMPILER MATCHES cl) + IF(NOT WITH_SHARED_LIBS) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") + SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") + SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") + + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + ENDIF(NOT WITH_SHARED_LIBS) + ENDIF(CMAKE_CXX_COMPILER MATCHES cl) +###################################################################################### + + + diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/src/hill_climbing.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/Lesson1/src/hill_climbing.cpp rename to trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/src/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/src/CMakeLists.txt deleted file mode 100644 index 689edd330..000000000 --- a/trunk/paradiseo-mo/tutorial/Lesson1/src/CMakeLists.txt +++ /dev/null @@ -1,122 +0,0 @@ - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}) -INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}) -INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) -###################################################################################### - - - -###################################################################################### -### 2) Specify where CMake can find the libraries (mandatory: before 3) ) -###################################################################################### - -# --> UNIX -IF(UNIX) - LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) - LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) - LINK_DIRECTORIES(${EO_LIB_DIR}\\release) - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) - -###################################################################################### - - - -###################################################################################### -### 3) Define your target(s): just an executable here -###################################################################################### - -# no matter what is the OS, hopefully -ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) - -ADD_DEPENDENCIES(hill_climbing tsp) - -SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON1_DIR}/build) -###################################################################################### - - - -###################################################################################### -### 4) Optionnal: define your target(s)'s version: no effect for windows -###################################################################################### - -SET(HILLCLIMBING_VERSION "1.0.beta") -SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}") -###################################################################################### - - - -###################################################################################### -### 5) Link the librairies for your target(s) -###################################################################################### - -# --> UNIX -IF(UNIX) - TARGET_LINK_LIBRARIES(hill_climbing tsp) - TARGET_LINK_LIBRARIES(hill_climbing eo) - TARGET_LINK_LIBRARIES(hill_climbing eoutils) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - TARGET_LINK_LIBRARIES(hill_climbing tsp) - TARGET_LINK_LIBRARIES(hill_climbing eod) - TARGET_LINK_LIBRARIES(hill_climbing eoutilsd) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - TARGET_LINK_LIBRARIES(hill_climbing tsp) - TARGET_LINK_LIBRARIES(hill_climbing eo) - TARGET_LINK_LIBRARIES(hill_climbing eoutils) - ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) -###################################################################################### - - - -###################################################################################### -### 6) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - - - diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt index 205da75f4..dee048c1f 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt @@ -1,18 +1,122 @@ + ###################################################################################### -### 0) Need lesson2 directory +### 1) Include the sources ###################################################################################### -SET(TUTORIAL_LESSON2_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) +INCLUDE_DIRECTORIES(${MO_SRC_DIR}) +INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) +###################################################################################### + + + +###################################################################################### +### 2) Specify where CMake can find the libraries (mandatory: before 3) ) +###################################################################################### + +# --> UNIX +IF(UNIX) + LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) + LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) + LINK_DIRECTORIES(${EO_LIB_DIR}\\release) + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) ###################################################################################### ###################################################################################### -### 1) Where must cmake go now ? +### 3) Define your target(s): just an executable here ###################################################################################### -SUBDIRS(src) +# no matter what is the OS, hopefully +ADD_EXECUTABLE(tabu_search tabu_search.cpp) + +ADD_DEPENDENCIES(tabu_search tsp) + +SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON2_DIR}/build) +###################################################################################### + + ###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(TABUSEARCH_VERSION "1.0.beta") +SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}") +###################################################################################### + + + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +# --> UNIX +IF(UNIX) + TARGET_LINK_LIBRARIES(tabu_search tsp) + TARGET_LINK_LIBRARIES(tabu_search eo) + TARGET_LINK_LIBRARIES(tabu_search eoutils) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + TARGET_LINK_LIBRARIES(tabu_search tsp) + TARGET_LINK_LIBRARIES(tabu_search eod) + TARGET_LINK_LIBRARIES(tabu_search eoutilsd) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + TARGET_LINK_LIBRARIES(tabu_search tsp) + TARGET_LINK_LIBRARIES(tabu_search eo) + TARGET_LINK_LIBRARIES(tabu_search eoutils) + ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) + MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) +###################################################################################### + + + +###################################################################################### +### 6) Windows advanced config - especially for Microsoft Visual Studio 8 +###################################################################################### + + IF(CMAKE_CXX_COMPILER MATCHES cl) + IF(NOT WITH_SHARED_LIBS) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") + SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") + SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") + + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + ENDIF(NOT WITH_SHARED_LIBS) + ENDIF(CMAKE_CXX_COMPILER MATCHES cl) +###################################################################################### + + + diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/src/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/src/CMakeLists.txt deleted file mode 100644 index dee048c1f..000000000 --- a/trunk/paradiseo-mo/tutorial/Lesson2/src/CMakeLists.txt +++ /dev/null @@ -1,122 +0,0 @@ - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}) -INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}) -INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) -###################################################################################### - - - -###################################################################################### -### 2) Specify where CMake can find the libraries (mandatory: before 3) ) -###################################################################################### - -# --> UNIX -IF(UNIX) - LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) - LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) - LINK_DIRECTORIES(${EO_LIB_DIR}\\release) - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) - -###################################################################################### - - - -###################################################################################### -### 3) Define your target(s): just an executable here -###################################################################################### - -# no matter what is the OS, hopefully -ADD_EXECUTABLE(tabu_search tabu_search.cpp) - -ADD_DEPENDENCIES(tabu_search tsp) - -SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON2_DIR}/build) -###################################################################################### - - - -###################################################################################### -### 4) Optionnal: define your target(s)'s version: no effect for windows -###################################################################################### - -SET(TABUSEARCH_VERSION "1.0.beta") -SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}") -###################################################################################### - - - -###################################################################################### -### 5) Link the librairies for your target(s) -###################################################################################### - -# --> UNIX -IF(UNIX) - TARGET_LINK_LIBRARIES(tabu_search tsp) - TARGET_LINK_LIBRARIES(tabu_search eo) - TARGET_LINK_LIBRARIES(tabu_search eoutils) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - TARGET_LINK_LIBRARIES(tabu_search tsp) - TARGET_LINK_LIBRARIES(tabu_search eod) - TARGET_LINK_LIBRARIES(tabu_search eoutilsd) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - TARGET_LINK_LIBRARIES(tabu_search tsp) - TARGET_LINK_LIBRARIES(tabu_search eo) - TARGET_LINK_LIBRARIES(tabu_search eoutils) - ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) -###################################################################################### - - - -###################################################################################### -### 6) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - - - diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/src/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/Lesson2/src/tabu_search.cpp rename to trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt index 5aac4afeb..9a1e23689 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt @@ -1,19 +1,122 @@ ###################################################################################### -### 0) Need lesson3 directory +### 1) Include the sources ###################################################################################### -SET(TUTORIAL_LESSON3_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) +INCLUDE_DIRECTORIES(${MO_SRC_DIR}) +INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) +###################################################################################### + + + +###################################################################################### +### 2) Specify where CMake can find the libraries (mandatory: before 3) ) +###################################################################################### + +# --> UNIX +IF(UNIX) + LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) + LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) + LINK_DIRECTORIES(${EO_LIB_DIR}\\release) + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) ###################################################################################### ###################################################################################### -### 1) Where must cmake go now ? +### 3) Define your target(s): just an executable here ###################################################################################### -SUBDIRS(src) +# no matter what is the OS, hopefully +ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) + +ADD_DEPENDENCIES(simulated_annealing tsp) + +SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON3_DIR}/build) +###################################################################################### + + + +###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(SIMULATEDANNEALING_VERSION "1.0.beta") +SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}") +###################################################################################### + + + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +# --> UNIX +IF(UNIX) + TARGET_LINK_LIBRARIES(simulated_annealing tsp) + TARGET_LINK_LIBRARIES(simulated_annealing eo) + TARGET_LINK_LIBRARIES(simulated_annealing eoutils) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + TARGET_LINK_LIBRARIES(simulated_annealing tsp) + TARGET_LINK_LIBRARIES(simulated_annealing eod) + TARGET_LINK_LIBRARIES(simulated_annealing eoutilsd) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + TARGET_LINK_LIBRARIES(simulated_annealing tsp) + TARGET_LINK_LIBRARIES(simulated_annealing eo) + TARGET_LINK_LIBRARIES(simulated_annealing eoutils) + ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) + MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) +###################################################################################### + + + +###################################################################################### +### 6) Windows advanced config - especially for Microsoft Visual Studio 8 +###################################################################################### + + IF(CMAKE_CXX_COMPILER MATCHES cl) + IF(NOT WITH_SHARED_LIBS) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") + SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") + SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") + + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + ENDIF(NOT WITH_SHARED_LIBS) + ENDIF(CMAKE_CXX_COMPILER MATCHES cl) +###################################################################################### + + -###################################################################################### \ No newline at end of file diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/src/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/Lesson3/src/simulated_annealing.cpp rename to trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/src/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/src/CMakeLists.txt deleted file mode 100644 index 9a1e23689..000000000 --- a/trunk/paradiseo-mo/tutorial/Lesson3/src/CMakeLists.txt +++ /dev/null @@ -1,122 +0,0 @@ - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}) -INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}) -INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src) -###################################################################################### - - - -###################################################################################### -### 2) Specify where CMake can find the libraries (mandatory: before 3) ) -###################################################################################### - -# --> UNIX -IF(UNIX) - LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug) - LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release) - LINK_DIRECTORIES(${EO_LIB_DIR}\\release) - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) - -###################################################################################### - - - -###################################################################################### -### 3) Define your target(s): just an executable here -###################################################################################### - -# no matter what is the OS, hopefully -ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp) - -ADD_DEPENDENCIES(simulated_annealing tsp) - -SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON3_DIR}/build) -###################################################################################### - - - -###################################################################################### -### 4) Optionnal: define your target(s)'s version: no effect for windows -###################################################################################### - -SET(SIMULATEDANNEALING_VERSION "1.0.beta") -SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}") -###################################################################################### - - - -###################################################################################### -### 5) Link the librairies for your target(s) -###################################################################################### - -# --> UNIX -IF(UNIX) - TARGET_LINK_LIBRARIES(simulated_annealing tsp) - TARGET_LINK_LIBRARIES(simulated_annealing eo) - TARGET_LINK_LIBRARIES(simulated_annealing eoutils) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - TARGET_LINK_LIBRARIES(simulated_annealing tsp) - TARGET_LINK_LIBRARIES(simulated_annealing eod) - TARGET_LINK_LIBRARIES(simulated_annealing eoutilsd) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - TARGET_LINK_LIBRARIES(simulated_annealing tsp) - TARGET_LINK_LIBRARIES(simulated_annealing eo) - TARGET_LINK_LIBRARIES(simulated_annealing eoutils) - ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) -###################################################################################### - - - -###################################################################################### -### 6) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - - - diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt old mode 100644 new mode 100755 index 59bd9dfc9..af8fe6133 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt @@ -1,8 +1,77 @@ + ###################################################################################### -### 1) Where must cmake go now ? +### 1) Include the sources ###################################################################################### -SUBDIRS(src) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}) +INCLUDE_DIRECTORIES(${MO_SRC_DIR}) ###################################################################################### + + +###################################################################################### +### 2) Define your target(s): just the tsp here +###################################################################################### + +SET(TSP_LIB_OUTPUT_PATH ${TSP_EXAMPLE_DIR}/build) +SET(LIBRARY_OUTPUT_PATH ${TSP_LIB_OUTPUT_PATH}) + +SET (TSP_SOURCES graph.cpp + route_init.cpp + route_eval.cpp + part_route_eval.cpp + edge_xover.cpp + order_xover.cpp + route_valid.cpp + partial_mapped_xover.cpp + city_swap.cpp + two_opt.cpp + two_opt_init.cpp + two_opt_next.cpp + two_opt_incr_eval.cpp + two_opt_tabu_list.cpp + two_opt_rand.cpp) + +# --> UNIX +IF(UNIX) + ADD_LIBRARY(tsp STATIC ${TSP_SOURCES}) + +# --> WIN +ELSEIF(WIN32) + ADD_LIBRARY(tsp STATIC ${TSP_SOURCES}) + +ENDIF(UNIX) +###################################################################################### + + + +###################################################################################### +### 3) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(TSP_VERSION "1.0.beta") +SET_TARGET_PROPERTIES(tsp PROPERTIES VERSION "${TSP_VERSION}") +###################################################################################### + + + +###################################################################################### +### 4) Windows advanced config - especially for Microsoft Visual Studio 8 +###################################################################################### + + IF(CMAKE_CXX_COMPILER MATCHES cl) + IF(NOT WITH_SHARED_LIBS) + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") + SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") + SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") + SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") + + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + ENDIF(NOT WITH_SHARED_LIBS) + ENDIF(CMAKE_CXX_COMPILER MATCHES cl) +###################################################################################### + diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/city_swap.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/city_swap.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/city_swap.h b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/city_swap.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/graph.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h b/trunk/paradiseo-mo/tutorial/examples/tsp/mix.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/mix.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/route.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/examples/tsp/src/CMakeLists.txt deleted file mode 100755 index af8fe6133..000000000 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}) -INCLUDE_DIRECTORIES(${MO_SRC_DIR}) - -###################################################################################### - - -###################################################################################### -### 2) Define your target(s): just the tsp here -###################################################################################### - -SET(TSP_LIB_OUTPUT_PATH ${TSP_EXAMPLE_DIR}/build) -SET(LIBRARY_OUTPUT_PATH ${TSP_LIB_OUTPUT_PATH}) - -SET (TSP_SOURCES graph.cpp - route_init.cpp - route_eval.cpp - part_route_eval.cpp - edge_xover.cpp - order_xover.cpp - route_valid.cpp - partial_mapped_xover.cpp - city_swap.cpp - two_opt.cpp - two_opt_init.cpp - two_opt_next.cpp - two_opt_incr_eval.cpp - two_opt_tabu_list.cpp - two_opt_rand.cpp) - -# --> UNIX -IF(UNIX) - ADD_LIBRARY(tsp STATIC ${TSP_SOURCES}) - -# --> WIN -ELSEIF(WIN32) - ADD_LIBRARY(tsp STATIC ${TSP_SOURCES}) - -ENDIF(UNIX) -###################################################################################### - - - -###################################################################################### -### 3) Optionnal: define your target(s)'s version: no effect for windows -###################################################################################### - -SET(TSP_VERSION "1.0.beta") -SET_TARGET_PROPERTIES(tsp PROPERTIES VERSION "${TSP_VERSION}") -###################################################################################### - - - -###################################################################################### -### 4) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h similarity index 100% rename from trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h rename to trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h