From 129657ee0404fc7a788d53cb44b733b7fa9abeb7 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 2 May 2017 15:36:16 +0200
Subject: [PATCH] for some packages that use pkgconfig: use the static list of
headers and libraries for the sake of completeness
---
modules/find/FindCHAMELEON.cmake | 6 +++---
modules/find/FindFFTW.cmake | 6 +++---
modules/find/FindMAGMA.cmake | 6 +++---
modules/find/FindSTARPU.cmake | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/find/FindCHAMELEON.cmake b/modules/find/FindCHAMELEON.cmake
index 9b581f5..837d57c 100644
--- a/modules/find/FindCHAMELEON.cmake
+++ b/modules/find/FindCHAMELEON.cmake
@@ -166,9 +166,9 @@ if(PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_GIVEN_BY_USER)
endif()
endif()
- set(CHAMELEON_INCLUDE_DIRS_DEP "${CHAMELEON_INCLUDE_DIRS}")
- set(CHAMELEON_LIBRARY_DIRS_DEP "${CHAMELEON_LIBRARY_DIRS}")
- set(CHAMELEON_LIBRARIES_DEP "${CHAMELEON_LIBRARIES}")
+ set(CHAMELEON_INCLUDE_DIRS_DEP "${CHAMELEON_STATIC_INCLUDE_DIRS}")
+ set(CHAMELEON_LIBRARY_DIRS_DEP "${CHAMELEON_STATIC_LIBRARY_DIRS}")
+ set(CHAMELEON_LIBRARIES_DEP "${CHAMELEON_STATIC_LIBRARIES}")
endif(PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_GIVEN_BY_USER)
diff --git a/modules/find/FindFFTW.cmake b/modules/find/FindFFTW.cmake
index a9d8b19..93e6a00 100644
--- a/modules/find/FindFFTW.cmake
+++ b/modules/find/FindFFTW.cmake
@@ -343,9 +343,9 @@ if (NOT FFTW_LOOK_FOR_MKL AND NOT FFTW_LOOK_FOR_ESSL)
endif()
endif(FFTW3_FOUND)
- set(FFTW_INCLUDE_DIRS_DEP "${FFTW_INCLUDE_DIRS}")
- set(FFTW_LIBRARY_DIRS_DEP "${FFTW_LIBRARY_DIRS}")
- set(FFTW_LIBRARIES_DEP "${FFTW_LIBRARIES}" )
+ set(FFTW_INCLUDE_DIRS_DEP "${FFTW_STATIC_INCLUDE_DIRS}")
+ set(FFTW_LIBRARY_DIRS_DEP "${FFTW_STATIC_LIBRARY_DIRS}")
+ set(FFTW_LIBRARIES_DEP "${FFTW_STATIC_LIBRARIES}" )
if (FFTW_LIBRARIES)
set(FFTW_WORKS TRUE)
diff --git a/modules/find/FindMAGMA.cmake b/modules/find/FindMAGMA.cmake
index d3eda98..548a0b8 100644
--- a/modules/find/FindMAGMA.cmake
+++ b/modules/find/FindMAGMA.cmake
@@ -159,9 +159,9 @@ if(PKG_CONFIG_EXECUTABLE AND NOT MAGMA_GIVEN_BY_USER)
set(MAGMA_LIBRARY_DIRS_DEP "")
set(MAGMA_LIBRARIES_DEP "")
# replace it anyway: we should update it with dependencies given by pkg-config
- set(MAGMA_INCLUDE_DIRS_DEP "${MAGMA_INCLUDE_DIRS}")
- set(MAGMA_LIBRARY_DIRS_DEP "${MAGMA_LIBRARY_DIRS}")
- set(MAGMA_LIBRARIES_DEP "${MAGMA_LIBRARIES}")
+ set(MAGMA_INCLUDE_DIRS_DEP "${MAGMA_STATIC_INCLUDE_DIRS}")
+ set(MAGMA_LIBRARY_DIRS_DEP "${MAGMA_STATIC_LIBRARY_DIRS}")
+ set(MAGMA_LIBRARIES_DEP "${MAGMA_STATIC_LIBRARIES}")
endif(PKG_CONFIG_EXECUTABLE AND NOT MAGMA_GIVEN_BY_USER)
diff --git a/modules/find/FindSTARPU.cmake b/modules/find/FindSTARPU.cmake
index 3471efc..e84517c 100644
--- a/modules/find/FindSTARPU.cmake
+++ b/modules/find/FindSTARPU.cmake
@@ -281,9 +281,9 @@ if(PKG_CONFIG_EXECUTABLE AND NOT STARPU_GIVEN_BY_USER)
else()
set(STARPU_LIBRARIES "STARPU_LIBRARIES-NOTFOUND")
endif()
- set(STARPU_INCLUDE_DIRS_DEP "${STARPU_INCLUDE_DIRS}")
- set(STARPU_LIBRARY_DIRS_DEP "${STARPU_LIBRARY_DIRS}")
- set(STARPU_LIBRARIES_DEP "${STARPU_LIBRARIES}")
+ 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}")
if (STARPU_SHM_FOUND)
set(STARPU_FOUND "TRUE")
else()
--
GitLab