deleted old makefiles and executables, added CMake config files
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@446 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
329738a589
commit
2ad83d09bf
4 changed files with 78 additions and 31 deletions
8
trunk/paradiseo-mo/tutorial/examples/CMakeLists.txt
Normal file
8
trunk/paradiseo-mo/tutorial/examples/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
######################################################################################
|
||||
### 1) Where must cmake go now ?
|
||||
######################################################################################
|
||||
|
||||
SUBDIRS(tsp)
|
||||
|
||||
######################################################################################
|
||||
8
trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt
Normal file
8
trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
######################################################################################
|
||||
### 1) Where must cmake go now ?
|
||||
######################################################################################
|
||||
|
||||
SUBDIRS(src)
|
||||
|
||||
######################################################################################
|
||||
62
trunk/paradiseo-mo/tutorial/examples/tsp/src/CMakeLists.txt
Executable file
62
trunk/paradiseo-mo/tutorial/examples/tsp/src/CMakeLists.txt
Executable file
|
|
@ -0,0 +1,62 @@
|
|||
|
||||
######################################################################################
|
||||
### 1) Include the sources
|
||||
######################################################################################
|
||||
|
||||
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
|
||||
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
|
||||
|
||||
######################################################################################
|
||||
|
||||
|
||||
######################################################################################
|
||||
### 2) Define your target(s): just the tsp here
|
||||
######################################################################################
|
||||
|
||||
SET(TSP_LIB_OUTPUT_PATH ${TSP_EXAMPLE_DIR}/build)
|
||||
SET(LIBRARY_OUTPUT_PATH ${TSP_LIB_OUTPUT_PATH} "TSP library output directory")
|
||||
|
||||
SET (TSP_SOURCES graph.cpp route_init.cpp route_eval.cpp part_route_eval.cpp edge_xover.cpp order_xover.cpp route_valid.cpp partial_mapped_xover.cpp city_swap.cpp two_opt.cpp two_opt_init.cpp two_opt_next.cpp two_opt_incr_eval.cpp two_opt_tabu_list.cpp two_opt_rand.cpp)
|
||||
|
||||
# --> UNIX
|
||||
IF(UNIX)
|
||||
ADD_LIBRARY(tsp STATIC ${TSP_SOURCES})
|
||||
|
||||
# --> WIN
|
||||
ELSEIF(WIN32)
|
||||
ADD_LIBRARY(tsp STATIC ${TSP_SOURCES})
|
||||
|
||||
ENDIF(UNIX)
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
||||
######################################################################################
|
||||
### 3) Optionnal: define your target(s)'s version: no effect for windows
|
||||
######################################################################################
|
||||
|
||||
SET(TSP_VERSION "1.0.beta")
|
||||
SET_TARGET_PROPERTIES(tsp PROPERTIES VERSION "${TSP_VERSION}")
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
||||
######################################################################################
|
||||
### 4) Windows advanced config - especially for Microsoft Visual Studio 8
|
||||
######################################################################################
|
||||
|
||||
IF(CMAKE_CXX_COMPILER MATCHES cl)
|
||||
IF(NOT WITH_SHARED_LIBS)
|
||||
IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
|
||||
SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy")
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od")
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2")
|
||||
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
|
||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
|
||||
|
||||
ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
|
||||
ENDIF(NOT WITH_SHARED_LIBS)
|
||||
ENDIF(CMAKE_CXX_COMPILER MATCHES cl)
|
||||
######################################################################################
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
INCLUDES = -I ${EO_DIR}/src/ -I ../../../../src/
|
||||
|
||||
|
||||
AM_CXXFLAGS =\
|
||||
-Wall\
|
||||
-Werror\
|
||||
-Wno-deprecated\
|
||||
-ansi\
|
||||
-pedantic
|
||||
|
||||
lib_LIBRARIES = libtsp.a
|
||||
|
||||
libtsp_a_SOURCES =\
|
||||
graph.cpp\
|
||||
route_init.cpp\
|
||||
route_eval.cpp\
|
||||
part_route_eval.cpp\
|
||||
edge_xover.cpp\
|
||||
order_xover.cpp\
|
||||
route_valid.cpp\
|
||||
partial_mapped_xover.cpp\
|
||||
city_swap.cpp\
|
||||
two_opt.cpp\
|
||||
two_opt_init.cpp\
|
||||
two_opt_next.cpp\
|
||||
two_opt_incr_eval.cpp\
|
||||
two_opt_tabu_list.cpp\
|
||||
two_opt_rand.cpp
|
||||
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue