From 00aae15be5fd9d9662c9d4bf35453cafe9d66f81 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 2 May 2017 16:29:04 +0200
Subject: [PATCH] fix pkg config var names
---
modules/find/FindSTARPU.cmake | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/find/FindSTARPU.cmake b/modules/find/FindSTARPU.cmake
index e84517c..fb01497 100644
--- a/modules/find/FindSTARPU.cmake
+++ b/modules/find/FindSTARPU.cmake
@@ -212,8 +212,8 @@ find_package(PkgConfig QUIET)
if(PKG_CONFIG_EXECUTABLE AND NOT STARPU_GIVEN_BY_USER)
pkg_search_module(STARPU_SHM libstarpu)
- set(STARPU_INCLUDE_DIRS "${STARPU_SHM_INCLUDE_DIRS}")
- set(STARPU_LIBRARY_DIRS "${STARPU_SHM_LIBRARY_DIRS}")
+ set(STARPU_INCLUDE_DIRS "${STARPU_SHM_STATIC_INCLUDE_DIRS}")
+ set(STARPU_LIBRARY_DIRS "${STARPU_SHM_STATIC_LIBRARY_DIRS}")
if(STARPU_LOOK_FOR_MPI AND MPI_FOUND)
pkg_search_module(STARPU_MPI libstarpumpi)
endif()
@@ -273,17 +273,17 @@ if(PKG_CONFIG_EXECUTABLE AND NOT STARPU_GIVEN_BY_USER)
string(REGEX MATCH "[^;]*/libfxt.a" FXT_STATIC_LIB "${STARPU_MPI_LDFLAGS_OTHER}")
list(APPEND STARPU_MPI_LIBRARIES "${FXT_STATIC_LIB}")
endif()
- set(STARPU_LIBRARIES "${STARPU_MPI_LIBRARIES}")
- set(STARPU_LINKER_FLAGS "${STARPU_MPI_LDFLAGS_OTHER}")
+ set(STARPU_LIBRARIES "${STARPU_MPI_STATIC_LIBRARIES}")
+ set(STARPU_LINKER_FLAGS "${STARPU_MPI_STATIC_LDFLAGS_OTHER}")
elseif(STARPU_SHM_LIBRARIES)
- set(STARPU_LIBRARIES "${STARPU_SHM_LIBRARIES}")
- set(STARPU_LINKER_FLAGS "${STARPU_SHM_LDFLAGS_OTHER}")
+ set(STARPU_LIBRARIES "${STARPU_SHM_STATIC_LIBRARIES}")
+ set(STARPU_LINKER_FLAGS "${STARPU_SHM_STATIC_LDFLAGS_OTHER}")
else()
set(STARPU_LIBRARIES "STARPU_LIBRARIES-NOTFOUND")
endif()
- set(STARPU_INCLUDE_DIRS_DEP "${STARPU_STATIC_INCLUDE_DIRS}")
- set(STARPU_LIBRARY_DIRS_DEP "${STARPU_STATIC_LIBRARY_DIRS}")
- set(STARPU_LIBRARIES_DEP "${STARPU_STATIC_LIBRARIES}")
+ set(STARPU_INCLUDE_DIRS_DEP "${STARPU_INCLUDE_DIRS}")
+ set(STARPU_LIBRARY_DIRS_DEP "${STARPU_LIBRARY_DIRS}")
+ set(STARPU_LIBRARIES_DEP "${STARPU_LIBRARIES}")
if (STARPU_SHM_FOUND)
set(STARPU_FOUND "TRUE")
else()
--
GitLab