tutorial PEO modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@903 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-01-24 14:52:36 +00:00
commit 15db5e4fea
37 changed files with 512 additions and 832 deletions

View file

@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/Lesson5.pdf
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5)
######################################################################################
@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
### 1) Include the sources
######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR})
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
######################################################################################
@ -46,12 +39,12 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_D
######################################################################################
IF(NOT WIN32 OR CYGWIN)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
ENDIF(NOT WIN32 OR CYGWIN)
# especially for Visual Studio
IF(WIN32 AND NOT CYGWIN)
LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${TSP_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
ENDIF(WIN32 AND NOT CYGWIN)
######################################################################################
@ -62,8 +55,8 @@ ENDIF(WIN32 AND NOT CYGWIN)
######################################################################################
# no matter what is the OS, hopefully
ADD_EXECUTABLE(example example.cpp)
ADD_DEPENDENCIES(example tsp peo rmc_mpi)
ADD_EXECUTABLE(pso main.cpp)
ADD_DEPENDENCIES(pso peo rmc_mpi)
######################################################################################
@ -74,7 +67,7 @@ ADD_DEPENDENCIES(example tsp peo rmc_mpi)
######################################################################################
SET(WALKTHROUGH_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(example PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
SET_TARGET_PROPERTIES(pso PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
######################################################################################
@ -83,7 +76,7 @@ SET_TARGET_PROPERTIES(example PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
### 5) Link the librairies
######################################################################################
TARGET_LINK_LIBRARIES(example ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
TARGET_LINK_LIBRARIES(pso ${XML2_LIBS} peo rmc_mpi eo eoutils)
######################################################################################