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

CMake config updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1858 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-06-18 15:11:41 +00:00
commit 3e716f32bd
53 changed files with 1142 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trunk/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
View file

@ -1,10 +1,42 @@
######################################################################################
### 1) Include the sources
######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
${MO_SRC_DIR}/src
${PROBLEMS_SRC_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../src)
######################################################################################
### 2) Specify where CMake can find the libraries
######################################################################################
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
ADD_EXECUTABLE(testSimpleTS testSimpleTS.cpp)
TARGET_LINK_LIBRARIES(testSimpleTS eoutils ga eo)
######################################################################################
### 3) Define your target(s): just an executable here
######################################################################################
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
SOURCE_GROUP(src FILES testSimpleTS.cpp)
ADD_EXECUTABLE(testSimpleTS
testSimpleTS.cpp
${MO_BIN_DIR}/tutorial/lesson4/testSimpleTS.param
)
ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
ADD_COMMANDS_NEWMO()
ADD_TARGET_NEWMO(lesson4)
IF(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(testSimpleTS testSimpleTS.cpp)
ELSE(ENABLE_CMAKE_EXAMPLE)
ADD_EXECUTABLE(testSimpleTS EXCLUDE_FROM_ALL testSimpleTS.cpp)
ENDIF(ENABLE_CMAKE_EXAMPLE)
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
######################################################################################
### 4) Link the librairies for your target(s)
######################################################################################
TARGET_LINK_LIBRARIES(testSimpleTS eoutils ga eo)

2
trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.cpp
View file

@ -164,7 +164,7 @@ void main_function(int argc, char **argv)
*
* ========================================================= */
orderShiftNeighborhood orderShiftNH(pow(vecSize-1, 2));
orderShiftNeighborhood orderShiftNH((vecSize-1) * (vecSize-1));
/* =========================================================
*

15
trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.param Normal file
View file

@ -0,0 +1,15 @@
###### General ######
# --help=0 # -h : Prints this message
# --stopOnUnknownParam=1 # Stop if unkown param entered
# --seed=1276172081 # -S : Random number seed
###### Persistence ######
# --status=./testSimpleTS.status # Status file
###### Representation ######
# --vecSize=8 # -V : Genotype size
###### Search Parameters ######
# --sizeTabuList=7 # -T : size of the tabu list
# --timeLimit=1 # -T : time limits