From 22f351fe9d2d4c593ade6104ae0fced8004889b7 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <pruvost@mygale-inria.plafrim.cluster>
Date: Mon, 23 Feb 2015 15:37:30 +0100
Subject: [PATCH] correct link with StarPU - SCALFMM_LIBRARIES was wrong
---
CMakeLists.txt | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73466c089..4833fe2d0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -400,22 +400,22 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
find_package(STARPU ${ScalFMM_STARPU_VERSION} REQUIRED
COMPONENTS ${STARPU_COMPONENT_LIST})
- set(STARPU_LIBRARIES_CPY "${STARPU_LIBRARIES}")
- set(STARPU_LIBRARIES "")
- foreach (starpu_lib ${STARPU_LIBRARIES_CPY})
+ foreach (starpu_libdir ${STARPU_LIBRARY_DIRS})
+ if (${starpu_libdir} MATCHES "^-L")
+ set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${starpu_libdir}")
+ else()
+ set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; -L${starpu_libdir}")
+ endif()
+ endforeach()
+ foreach (starpu_lib ${STARPU_LIBRARIES})
if (EXISTS ${starpu_lib} OR ${starpu_lib} MATCHES "^-")
- set(STARPU_LIBRARIES "${STARPU_LIBRARIES} ${starpu_lib}")
+ set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${starpu_lib}")
else()
- set(STARPU_LIBRARIES "${STARPU_LIBRARIES} -l${starpu_lib}")
+ set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; -l${starpu_lib}")
endif()
endforeach()
- if (STARPU_LIBRARY_DIRS)
- set(STARPU_LIBRARIES"-L${STARPU_LIBRARY_DIRS} ${STARPU_LIBRARIES}")
- endif()
- set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${STARPU_LIBRARIES}")
if (STARPU_INCLUDE_DIRS)
- set(STARPU_INCLUDES "${STARPU_INCLUDE_DIRS}")
- include_directories(${STARPU_INCLUDES})
+ include_directories(${STARPU_INCLUDE_DIRS})
endif()
option( ScalFMM_USE_CUDA "Set to ON to use CUDA with StarPU" OFF )
@@ -440,7 +440,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
message(STATUS " STARPU_LIBRARIES = ${STARPU_LIBRARIES}")
if (STARPU_INCLUDE_DIRS)
- message(STATUS " STARPU_INCLUDES = ${STARPU_INCLUDES}")
+ message(STATUS " STARPU_INCLUDES = ${STARPU_INCLUDE_DIRS}")
endif()
endif(ScalFMM_USE_STARPU)
--
GitLab