From 2f8a1fcc52efb7f9062f9606abe51a75c8c2aaa9 Mon Sep 17 00:00:00 2001 From: boufaras Date: Thu, 29 Sep 2011 14:03:55 +0000 Subject: [PATCH] updated git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2438 331e1502-861f-0410-8da2-ba01fb791d7f --- .../ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt b/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt index 66f7db766..1d3422c68 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt @@ -13,8 +13,6 @@ INCLUDE_DIRECTORIES( # include CUDA source directory ${CUDA_SRC_DIR} - # include NVIDIA source directory - ${NVIDIA_SRC_DIR} # include EO source directory ${PARADISEO_EO_SRC_DIR}/src # include MO source directory @@ -33,7 +31,7 @@ INCLUDE_DIRECTORIES( ### 2) Specify where CMake can find the libraries ###################################################################################### -LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${NVIDIA_LIB_DIR} ${CUDA_LIB_DIR} ) +LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${CUDA_LIB_DIR} ) ###################################################################################### @@ -48,11 +46,11 @@ CUDA_ADD_EXECUTABLE(GPUtestSimpleHCByCpy testSimpleHCByCpy.cu) CUDA_ADD_EXECUTABLE(GPUtestSimpleTS testSimpleTS.cu) CUDA_ADD_EXECUTABLE(GPUtestSimulatedAnnealing testSimulatedAnnealing.cu) -TARGET_LINK_LIBRARIES(GPUtestFirstImpr eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(GPUtestNeutralHC eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(GPUtestSimpleHC eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(GPUtestSimpleHCByCpy eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(GPUtestSimpleTS eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(GPUtestSimulatedAnnealing eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestFirstImpr eoutils ga eo) +TARGET_LINK_LIBRARIES(GPUtestNeutralHC eoutils ga eo) +TARGET_LINK_LIBRARIES(GPUtestSimpleHC eoutils ga eo) +TARGET_LINK_LIBRARIES(GPUtestSimpleHCByCpy eoutils ga eo) +TARGET_LINK_LIBRARIES(GPUtestSimpleTS eoutils ga eo) +TARGET_LINK_LIBRARIES(GPUtestSimulatedAnnealing eoutils ga eo) ######################################################################################