There are now 5 lessons: 1=minimize_function, 2=HC, 3=TS, 4=SA and 5=ILS
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1055 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
9100f88efa
commit
2d4038a552
33 changed files with 1175 additions and 500 deletions
|
|
@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
|
|||
|
||||
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param )
|
||||
|
||||
ADD_CUSTOM_COMMAND(
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET install
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
|
|
@ -20,6 +20,7 @@ ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/pa
|
|||
${ParadisEO-MO_SOURCE_DIR}/tutorial/Lesson4/param
|
||||
${ParadisEO-MO_BINARY_DIR}/tutorial/Lesson4)
|
||||
|
||||
|
||||
######################################################################################
|
||||
### 2) Specify where CMake can find the libraries
|
||||
######################################################################################
|
||||
|
|
@ -30,7 +31,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
|
|||
|
||||
# especially for Visual Studio
|
||||
IF(WIN32 AND NOT CYGWIN)
|
||||
LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
|
||||
LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
|
||||
ENDIF(WIN32 AND NOT CYGWIN)
|
||||
|
||||
######################################################################################
|
||||
|
|
@ -41,10 +42,9 @@ ENDIF(WIN32 AND NOT CYGWIN)
|
|||
### 3) Define your target(s): just an executable here
|
||||
######################################################################################
|
||||
|
||||
ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp)
|
||||
|
||||
ADD_DEPENDENCIES(iterated_local_search tsp)
|
||||
ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp)
|
||||
|
||||
ADD_DEPENDENCIES(simulated_annealing tsp)
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
@ -53,8 +53,8 @@ ADD_DEPENDENCIES(iterated_local_search tsp)
|
|||
### 4) Optionnal: define your target(s)'s version: no effect for windows
|
||||
######################################################################################
|
||||
|
||||
SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION})
|
||||
SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}")
|
||||
SET(SIMULATEDANNEALING_VERSION ${GLOBAL_VERSION})
|
||||
SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}")
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
@ -63,6 +63,7 @@ SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALS
|
|||
### 5) Link the librairies for your target(s)
|
||||
######################################################################################
|
||||
|
||||
TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils)
|
||||
TARGET_LINK_LIBRARIES(simulated_annealing tsp eo eoutils)
|
||||
|
||||
######################################################################################
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue