diff --git a/problems/DTLZ/CMakeLists.txt b/problems/DTLZ/CMakeLists.txt index d74bba102..30bbb14d3 100644 --- a/problems/DTLZ/CMakeLists.txt +++ b/problems/DTLZ/CMakeLists.txt @@ -94,7 +94,7 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug) ENDIF(CMAKE_BUILD_TYPE MATCHES Debug) ###################################################################################### -### 3) Link the librairies for your executable +### 3) Link the libraries for your executable ###################################################################################### ADD_SUBDIRECTORY(doc) diff --git a/problems/DTLZ/application/CMakeLists.txt b/problems/DTLZ/application/CMakeLists.txt index a3e65fd72..583068779 100644 --- a/problems/DTLZ/application/CMakeLists.txt +++ b/problems/DTLZ/application/CMakeLists.txt @@ -14,6 +14,7 @@ INCLUDE_DIRECTORIES(${PARADISEO_EO_SRC_DIR}/src ### 2) Specify where CMake can find the libraries ###################################################################################### +LINK_DIRECTORIES(${PARADISEO_DIR}/build/lib) LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib) LINK_DIRECTORIES(${PARADISEO_MOEO_BIN_DIR}/lib) LINK_DIRECTORIES(${DTLZ_BINARY_DIR}/lib) diff --git a/problems/DTLZ/install.cmake b/problems/DTLZ/install.cmake index dc32aaa0d..bc2f13579 100644 --- a/problems/DTLZ/install.cmake +++ b/problems/DTLZ/install.cmake @@ -1,28 +1,28 @@ -######################################################################################################### +############################################################################### # 1) ParadisEO install: SIMPLE Configuration -######################################################################################################### +############################################################################### -# Here, just specify PARADISEO_DIR : the directory where ParadisEO has been installed -SET(PARADISEO_DIR "/home/humeau/Bureau/paradiseo-1.3-beta2/" CACHE PATH "ParadisEO directory" FORCE) -######################################################################################################### +# Here, just specify PARADISEO_DIR : the directory where ParadisEO has +# been installed +SET(PARADISEO_DIR "${CMAKE_BINARY_DIR}/../../../" CACHE PATH "ParadisEO directory" FORCE) + +############################################################################### -######################################################################################################### +############################################################################### # 2) ParadisEO install: ADVANCED Configuration -######################################################################################################### +############################################################################### -SET(PARADISEO_EO_SRC_DIR "${PARADISEO_DIR}/paradiseo-eo" CACHE PATH "ParadisEO-EO source directory" FORCE) -SET(PARADISEO_EO_BIN_DIR "${PARADISEO_DIR}/paradiseo-eo/build" CACHE PATH "ParadisEO-EO binary directory" FORCE) +SET(PARADISEO_EO_SRC_DIR "${PARADISEO_DIR}/eo" CACHE PATH "ParadisEO-EO source directory" FORCE) +SET(PARADISEO_EO_BIN_DIR "${PARADISEO_DIR}/build/eo" CACHE PATH "ParadisEO-EO binary directory" FORCE) -SET(PARADISEO_MO_SRC_DIR "${PARADISEO_DIR}/paradiseo-mo" CACHE PATH "ParadisEO-MO source directory" FORCE) -SET(PARADISEO_MO_BIN_DIR "${PARADISEO_DIR}/paradiseo-mo/build" CACHE PATH "ParadisEO-MO binary directory" FORCE) +SET(PARADISEO_MO_SRC_DIR "${PARADISEO_DIR}/mo" CACHE PATH "ParadisEO-MO source directory" FORCE) +SET(PARADISEO_MO_BIN_DIR "${PARADISEO_DIR}/build/mo" CACHE PATH "ParadisEO-MO binary directory" FORCE) -SET(PARADISEO_MOEO_SRC_DIR "${PARADISEO_DIR}/paradiseo-moeo" CACHE PATH "ParadisEO-MOEO source directory" FORCE) -SET(PARADISEO_MOEO_BIN_DIR "${PARADISEO_DIR}/paradiseo-moeo/build" CACHE PATH "ParadisEO-MOEO binary directory" FORCE) +SET(PARADISEO_MOEO_SRC_DIR "${PARADISEO_DIR}/moeo" CACHE PATH "ParadisEO-MOEO source directory" FORCE) +SET(PARADISEO_MOEO_BIN_DIR "${PARADISEO_DIR}/build/moeo" CACHE PATH "ParadisEO-MOEO binary directory" FORCE) -SET(PARADISEO_PEO_SRC_DIR "${PARADISEO_DIR}/paradiseo-peo" CACHE PATH "ParadisEO-PEO source directory" FORCE) -SET(PARADISEO_PEO_BIN_DIR "${PARADISEO_DIR}/paradiseo-peo/build" CACHE PATH "ParadisEO-PEO binary directory" FORCE) -######################################################################################################### +############################################################################### diff --git a/problems/DTLZ/src/CMakeLists.txt b/problems/DTLZ/src/CMakeLists.txt index ba815fe04..5075f296a 100644 --- a/problems/DTLZ/src/CMakeLists.txt +++ b/problems/DTLZ/src/CMakeLists.txt @@ -9,9 +9,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### - ###################################################################################### -### 2) Define your target(s): just the flow-shop lib here +### 2) Define your target(s) ###################################################################################### SET(DTLZ_LIB_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) diff --git a/problems/DTLZ/test/CMakeLists.txt b/problems/DTLZ/test/CMakeLists.txt index 900949952..43e552333 100644 --- a/problems/DTLZ/test/CMakeLists.txt +++ b/problems/DTLZ/test/CMakeLists.txt @@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(${PARADISEO_EO_SRC_DIR}/src ### 2) Specify where CMake can find the libraries ###################################################################################### +LINK_DIRECTORIES(${PARADISEO_DIR}/build/lib) LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib) LINK_DIRECTORIES(${PARADISEO_MOEO_BIN_DIR}/lib) LINK_DIRECTORIES(${DTLZ_BINARY_DIR}/lib)