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

Browse source
This commit is contained in:
legrand 2007-07-05 09:18:30 +00:00
commit ae4ffd889e
7 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/installParadiseo.sh
View file

@ -406,7 +406,7 @@ function run_install_step()
execute_cmd "cd $installKitPath/paradiseo-mo/build" "[$currentStepCounter-1] Go in Paradiseo-MO dir" $SPY
RETURN=$?
execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY
execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY
RETURN=`expr $RETURN + $?`
execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-MO" $SPY
RETURN=`expr $RETURN + $?`
@ -429,7 +429,7 @@ function run_install_step()
execute_cmd "cd $installKitPath/paradiseo-moeo/build" "[$currentStepCounter-1] Go in Paradiseo-MOEO dir" $SPY
RETURN=$?
execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY
execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY
RETURN=`expr $RETURN + $?`
execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-MOEO" $SPY
RETURN=`expr $RETURN + $?`
@ -665,7 +665,7 @@ function run_install_step()
execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir" $SPY
RETURN=$?
execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo/ -DMOdir=$installKitPath/paradiseo-mo" "[$currentStepCounter-2] Run CMake for ParadisEO-PEO" $SPY
execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo/ -DMOdir=$installKitPath/paradiseo-mo" "[$currentStepCounter-2] Run CMake for ParadisEO-PEO" $SPY
RETURN=`expr $RETURN + $?`
execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-PEO " $SPY
RETURN=`expr $RETURN + $?`

4
trunk/paradiseo-peo/tutorial/CMakeLists.txt
View file

@ -3,8 +3,8 @@
### 1) Definitions (required for tsp target)
######################################################################################
SET(TSP_EXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples/tsp CACHE PATH "TSP example directory")
SET(TSP_SRC_DIR ${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp)
SET(TSP_BINARY_DIR ${ParadisEO-PEO_BINARY_DIR}/tutorial/examples/tsp)
######################################################################################
######################################################################################

8
trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt
View file

@ -15,7 +15,7 @@ SET (CMAKE_CXX_COMPILER mpicxx)
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
INCLUDE_DIRECTORIES(${PEO_SRC_DIR})
INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR}/src)
######################################################################################
@ -26,8 +26,8 @@ INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
LINK_DIRECTORIES( ${EO_SRC_DIR}
${EO_SRC_DIR}/utils
${PEO_DIR}/build
${TSP_EXAMPLE_DIR}/build)
${ParadisEO-PEO_BINARY_DIR}/lib
${TSP_BINARY_DIR}/lib)
######################################################################################
@ -42,8 +42,6 @@ ADD_EXECUTABLE(tspExample main.cpp)
ADD_DEPENDENCIES(tspExample tsp)
ADD_DEPENDENCIES(tspExample peo)
ADD_DEPENDENCIES(tspExample rmc_mpi)
SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON1_DIR}/build)
######################################################################################

9
trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt
View file

@ -15,7 +15,7 @@ SET (CMAKE_CXX_COMPILER mpicxx)
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
INCLUDE_DIRECTORIES(${PEO_SRC_DIR})
INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
######################################################################################
@ -26,9 +26,9 @@ INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
LINK_DIRECTORIES( ${EO_SRC_DIR}
${EO_SRC_DIR}/utils
${PEO_DIR}/build
${TSP_EXAMPLE_DIR}/build)
${ParadisEO-PEO_BINARY_DIR}/lib
${TSP_BINARY_DIR}/lib)
######################################################################################
@ -43,7 +43,6 @@ ADD_DEPENDENCIES(tspExample tsp)
ADD_DEPENDENCIES(tspExample peo)
ADD_DEPENDENCIES(tspExample rmc_mpi)
SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON2_DIR}/build)
######################################################################################

6
trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt
View file

@ -15,7 +15,7 @@ SET (CMAKE_CXX_COMPILER mpicxx)
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
INCLUDE_DIRECTORIES(${PEO_SRC_DIR})
INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
######################################################################################
@ -26,8 +26,8 @@ INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
LINK_DIRECTORIES( ${EO_SRC_DIR}
${EO_SRC_DIR}/utils
${PEO_DIR}/build
${TSP_EXAMPLE_DIR}/build)
${ParadisEO-PEO_BINARY_DIR}/lib
${TSP_BINARY_DIR}/lib)
######################################################################################

12
trunk/paradiseo-peo/tutorial/Walkthrough/CMakeLists.txt
View file

@ -1,10 +1,18 @@
######################################################################################
### 0) Set the compiler
### 0) Pre-config
######################################################################################
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(copy_walkthrough_config ALL)
ADD_CUSTOM_COMMAND(
TARGET copy_walkthrough_config
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_directory
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Walkthrough/config
${ParadisEO-PEO_BINARY_DIR}/tutorial/Walkthrough/tsp/config)
######################################################################################
@ -15,7 +23,7 @@ SET (CMAKE_CXX_COMPILER mpicxx)
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
INCLUDE_DIRECTORIES(${PEO_SRC_DIR})
INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
######################################################################################

18
trunk/paradiseo-peo/tutorial/examples/tsp/CMakeLists.txt
View file

@ -1,4 +1,20 @@
######################################################################################
### 0) Copy the "benchs" directory in the build directory to easily run the lessons
######################################################################################
ADD_CUSTOM_TARGET(copy_tsp_benchmarks ALL)
ADD_CUSTOM_COMMAND(
TARGET copy_tsp_benchmarks
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_directory
${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs
${ParadisEO-PEO_BINARY_DIR}/tutorial/examples/tsp/benchs)
######################################################################################
######################################################################################
### 1) Include the sources
######################################################################################
@ -14,7 +30,7 @@ INCLUDE_DIRECTORIES(${PEO_SRC_DIR})
### 2) Define your target(s): just the tsp lib here
######################################################################################
SET(TSP_LIB_OUTPUT_PATH ${TSP_EXAMPLE_DIR}/build)
SET(TSP_LIB_OUTPUT_PATH ${TSP_BINARY_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${TSP_LIB_OUTPUT_PATH})
SET (TSP_SOURCES data.h