nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New config of Paradiseo with Cmake 2.6

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1347 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2009-01-16 14:28:26 +00:00
commit 712e8d6cfa
84 changed files with 1468 additions and 739 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/paradiseo-peo/CMakeLists.txt
View file

@ -1,3 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
##########################################################################################################################################
### 0) If you want to set your own variables in peo-conf.cmake and avoid the cmd line
@ -15,15 +16,18 @@ INCLUDE(peo-conf.cmake OPTIONAL)
# check libxml2
FIND_PROGRAM(XML2_CONFIG_PROGRAM NAMES xml2-config PATHS /usr/local/bin /usr/bin DOC "The libxml2 (www.xmlsoft.org) configuration tool")
IF(NOT XML2_CONFIG_PROGRAM)
#IF(NOT XML2_CONFIG_PROGRAM)
#MESSAGE(FATAL_ERROR "Libxml2 cannot be found on your system. Libxml2 is required for ParadisEO-PEO install")
ENDIF(NOT XML2_CONFIG_PROGRAM)
#ENDIF(NOT XML2_CONFIG_PROGRAM)
# set libxml2 cflags in XML2_CFLAGS
EXECUTE_PROCESS(COMMAND ${XML2_CONFIG_PROGRAM} --cflags OUTPUT_VARIABLE XML2_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
# set libxml2 libs in XML2_LIBS
EXECUTE_PROCESS(COMMAND ${XML2_CONFIG_PROGRAM} --libs OUTPUT_VARIABLE XML2_LIBS)
# set libxml2 libs in XML2_LIBSINCLUDE(FindLibXml2)
EXECUTE_PROCESS(COMMAND ${XML2_CONFIG_PROGRAM} --libs OUTPUT_VARIABLE XML2_LIBS)
STRING(STRIP ${XML2_LIBS} XML2_LIBS)
######################################################################################
@ -36,10 +40,10 @@ PROJECT(ParadisEO-PEO)
SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE)
SET(PACKAGE_NAME "ParadisEO-PEO - Parallel and distributed Evolving Objects" CACHE STRING "Package name" FORCE)
SET(PACKAGE_STRING "ParadisEO-PEO 1.1" CACHE STRING "PEO Package string full name" FORCE)
SET(PACKAGE_VERSION "1.1" CACHE STRING "Package version" FORCE)
SET(GLOBAL_VERSION "1.1" CACHE STRING "Global version" FORCE)
SET(VERSION "1.1" CACHE STRING "Version" FORCE)
SET(PACKAGE_STRING "ParadisEO-PEO 1.2" CACHE STRING "PEO Package string full name" FORCE)
SET(PACKAGE_VERSION "1.2" CACHE STRING "Package version" FORCE)
SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE)
SET(VERSION "1.2" CACHE STRING "Version" FORCE)
##########################################################################################################################################

4
trunk/paradiseo-peo/doc/peo.doxyfile.cmake
View file

@ -8,6 +8,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@
OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ABBREVIATE_BRIEF = "The $name class" \
@ -29,6 +30,7 @@ STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 8
@ -224,6 +226,8 @@ DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_DEPTH = 0
DOT_TRANSPARENT = NO
DOT_MULTI_TARGETS = NO

3
trunk/paradiseo-peo/src/CMakeLists.txt
View file

@ -3,6 +3,7 @@
### 1) Where must cmake go now ?
######################################################################################
SUBDIRS(core rmc)
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(rmc)
######################################################################################

3
trunk/paradiseo-peo/src/peoAsyncIslandMig.h
View file

@ -101,11 +101,10 @@ template< class TYPESELECT, class TYPEREPLACE > class peoAsyncIslandMig : public
//! @param std :: queue< TYPEREPLACE > imm
//! @param std :: queue< TYPESELECT > em
//! @param std :: queue< Cooperative* > coop_em
continuator & cont;
selector <TYPESELECT> & select;
replacement <TYPEREPLACE> & replace;
Topology& topology;
continuator & cont;
std :: queue< TYPEREPLACE > imm;
std :: queue< TYPESELECT > em;
std :: queue< Cooperative* > coop_em;

3
trunk/paradiseo-peo/src/peoPSO.h
View file

@ -68,7 +68,8 @@ template <class POT> class peoPSOSelect: public eoSelectOne<POT>
//! @return POT&
virtual const POT& operator()(const eoPop<POT>& _pop)
{
return topology.globalBest(_pop);
//return topology.globalBest(_pop);
return topology.globalBest();
}
private:

2
trunk/paradiseo-peo/src/rmc/CMakeLists.txt
View file

@ -4,6 +4,6 @@
### 1) Where must cmake go now ?
######################################################################################
SUBDIRS(mpi)
ADD_SUBDIRECTORY(mpi)
######################################################################################

1
trunk/paradiseo-peo/test/t-Mpdallexit.cpp
View file

@ -35,7 +35,6 @@
*/
#include <iostream>
#include <cstdlib>
int main (int __argc, char *__argv[])
{

1
trunk/paradiseo-peo/test/t-Mpdboot.cpp
View file

@ -35,7 +35,6 @@
*/
#include <iostream>
#include <cstdlib>
int main (int __argc, char *__argv[])
{

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

@ -14,6 +14,12 @@ SET(FLOWSHOP_BIN_DIR "${MOEO_BIN_DIR}/tutorial/examples/flowshop" CACHE PATH "Fl
### 2) Where must cmake go now ?
######################################################################################
SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4 Lesson5 Lesson6 Meta-models)
ADD_SUBDIRECTORY(examples)
ADD_SUBDIRECTORY(Lesson1)
ADD_SUBDIRECTORY(Lesson2)
ADD_SUBDIRECTORY(Lesson3)
ADD_SUBDIRECTORY(Lesson4)
ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson6)
ADD_SUBDIRECTORY(Meta-models)
######################################################################################

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

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1
)
######################################################################################
@ -48,7 +57,7 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
######################################################################################
ADD_EXECUTABLE(pso mainPSO.cpp)
ADD_DEPENDENCIES(pso peo rmc_mpi)
ADD_DEPENDENCIES(pso peo rmc_mpi)
ADD_EXECUTABLE(ea mainEA.cpp)
ADD_DEPENDENCIES(ea peo rmc_mpi)
######################################################################################

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

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2
)
######################################################################################
@ -47,8 +56,8 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
### 3) Define your target(s): just an executable here
######################################################################################
ADD_EXECUTABLE(ea mainEA.cpp)
ADD_DEPENDENCIES(ea peo rmc_mpi)
ADD_EXECUTABLE(ea2 mainEA.cpp)
ADD_DEPENDENCIES(ea2 peo rmc_mpi)
######################################################################################
@ -57,7 +66,7 @@ ADD_DEPENDENCIES(ea peo rmc_mpi)
######################################################################################
SET(LESSON2_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON2_VERSION}")
SET_TARGET_PROPERTIES(ea2 PROPERTIES VERSION "${LESSON2_VERSION}")
######################################################################################
@ -65,6 +74,6 @@ SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON2_VERSION}")
### 5) Link the librairies
######################################################################################
TARGET_LINK_LIBRARIES(ea ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(ea2 ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
######################################################################################

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

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3
)
######################################################################################
@ -47,10 +56,10 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
### 3) Define your target(s): just an executable here
######################################################################################
ADD_EXECUTABLE(pso mainPSO.cpp)
ADD_DEPENDENCIES(pso peo rmc_mpi)
ADD_EXECUTABLE(ea mainEA.cpp)
ADD_DEPENDENCIES(ea peo rmc_mpi)
ADD_EXECUTABLE(pso3 mainPSO.cpp)
ADD_DEPENDENCIES(pso3 peo rmc_mpi)
ADD_EXECUTABLE(ea3 mainEA.cpp)
ADD_DEPENDENCIES(ea3 peo rmc_mpi)
######################################################################################
@ -59,8 +68,8 @@ ADD_DEPENDENCIES(ea peo rmc_mpi)
######################################################################################
SET(LESSON3_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(pso PROPERTIES VERSION "${LESSON3_VERSION}")
SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON3_VERSION}")
SET_TARGET_PROPERTIES(pso3 PROPERTIES VERSION "${LESSON3_VERSION}")
SET_TARGET_PROPERTIES(ea3 PROPERTIES VERSION "${LESSON3_VERSION}")
######################################################################################
@ -68,8 +77,8 @@ SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON3_VERSION}")
### 5) Link the librairies
######################################################################################
TARGET_LINK_LIBRARIES(pso ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(ea ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(pso3 ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(ea3 ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
######################################################################################

39
trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt
View file

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4
)
######################################################################################

47
trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt
View file

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/param
${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/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/param
# ${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/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5
)
######################################################################################
@ -47,8 +56,8 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
### 3) Define your target(s): just an executable here
######################################################################################
ADD_EXECUTABLE(ea main.cpp)
ADD_DEPENDENCIES(ea peo rmc_mpi)
ADD_EXECUTABLE(ea5 main.cpp)
ADD_DEPENDENCIES(ea5 peo rmc_mpi)
######################################################################################
@ -58,7 +67,7 @@ ADD_DEPENDENCIES(ea peo rmc_mpi)
######################################################################################
SET(Lesson5_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${Lesson5_VERSION}")
SET_TARGET_PROPERTIES(ea5 PROPERTIES VERSION "${Lesson5_VERSION}")
######################################################################################
@ -66,7 +75,7 @@ SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${Lesson5_VERSION}")
### 5) Link the librairies
######################################################################################
TARGET_LINK_LIBRARIES(ea ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(ea5 ${XML2_LIBS} peo rmc_mpi eo eoutils peo)
######################################################################################

47
trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt
View file

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6
)
######################################################################################
@ -47,8 +56,8 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_
### 3) Define your target(s): just an executable here
######################################################################################
ADD_EXECUTABLE(ea main.cpp)
ADD_DEPENDENCIES(ea peo rmc_mpi)
ADD_EXECUTABLE(ea6 main.cpp)
ADD_DEPENDENCIES(ea6 peo rmc_mpi)
######################################################################################
@ -58,7 +67,7 @@ ADD_DEPENDENCIES(ea peo rmc_mpi)
######################################################################################
SET(Lesson6_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${Lesson6_VERSION}")
SET_TARGET_PROPERTIES(ea6 PROPERTIES VERSION "${Lesson6_VERSION}")
######################################################################################
@ -66,7 +75,7 @@ SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${Lesson6_VERSION}")
### 5) Link the librairies
######################################################################################
TARGET_LINK_LIBRARIES(ea ${XML2_LIBS} tsp peo rmc_mpi eo eoutils peo)
TARGET_LINK_LIBRARIES(ea6 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils peo)
######################################################################################

39
trunk/paradiseo-peo/tutorial/Meta-models/CMakeLists.txt
View file

@ -5,22 +5,31 @@
SET (CMAKE_CXX_COMPILER mpicxx)
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/schema.xml)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/schema.xml)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models)
ADD_CUSTOM_COMMAND(
TARGET install
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/param
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models)
#ADD_CUSTOM_COMMAND(
# TARGET install
# POST_BUILD
# COMMAND ${CMAKE_COMMAND}
# ARGS -E copy_if_different
# ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/schema.xml
# ${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/param
${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/Meta-models/schema.xml
${ParadisEO-PEO_BINARY_DIR}/tutorial/Meta-models
)
######################################################################################

2
trunk/paradiseo-peo/tutorial/Meta-models/cooperation.cpp
View file

@ -1,5 +1,5 @@
#include <iostream>
#include <stdlib.h>
#include <cstdlib>
int
main(int __argc, char *__argv[])

2
trunk/paradiseo-peo/tutorial/Meta-models/multistart.cpp
View file

@ -1,5 +1,5 @@
#include <iostream>
#include <stdlib.h>
#include <cstdlib>
int
main(int __argc, char *__argv[])

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

@ -4,7 +4,7 @@
### 1) Where must cmake go now ?
######################################################################################
SUBDIRS(tsp)
ADD_SUBDIRECTORY(tsp)
######################################################################################

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

@ -3,14 +3,30 @@
### 0) Copy the "benchs" directory in the build directory to easily run the lessons
######################################################################################
ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs)
ADD_CUSTOM_COMMAND(
TARGET install
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)
#ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs)
#ADD_CUSTOM_COMMAND(
# TARGET install
# 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)
SET(BENCH_LIST
eil101.opt.tour
eil101.tsp
eil101.tsp.hc
)
FOREACH (bench ${BENCH_LIST})
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs/${bench}
${ParadisEO-PEO_BINARY_DIR}/tutorial/examples/tsp/benchs/${bench}
)
ENDFOREACH (bench)
######################################################################################