new cmake config
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@516 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
4024c0e623
commit
a1b212cabc
8 changed files with 42 additions and 43 deletions
|
|
@ -7,7 +7,7 @@
|
|||
INCLUDE_DIRECTORIES(${EO_SRC_DIR})
|
||||
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils)
|
||||
INCLUDE_DIRECTORIES(${MO_SRC_DIR})
|
||||
INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
|
||||
INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(${TSP_EXAMPLE_DIR}/src)
|
|||
|
||||
# --> UNIX
|
||||
IF(UNIX)
|
||||
LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_EXAMPLE_DIR}/build)
|
||||
LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_BINARY_DIR}/lib)
|
||||
|
||||
# --> WIN
|
||||
ELSEIF(WIN32)
|
||||
|
|
@ -28,10 +28,10 @@ ELSEIF(WIN32)
|
|||
ENDIF (NOT DEFINED CMAKE_BUILD_TYPE)
|
||||
|
||||
IF (CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\debug)
|
||||
LINK_DIRECTORIES(${TSP_BINARY_DIR}\\debug)
|
||||
LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
|
||||
ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
|
||||
LINK_DIRECTORIES(${TSP_EXAMPLE_DIR}\\build\\release)
|
||||
LINK_DIRECTORIES(${TSP_BINARY_DIR}\\release)
|
||||
LINK_DIRECTORIES(${EO_LIB_DIR}\\release)
|
||||
ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
|
||||
|
|
@ -49,8 +49,6 @@ ENDIF(UNIX)
|
|||
ADD_EXECUTABLE(tabu_search tabu_search.cpp)
|
||||
|
||||
ADD_DEPENDENCIES(tabu_search tsp)
|
||||
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON2_DIR}/build)
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue