From 48f38636796ff8a5cd649a671126bf8ebc27861e Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Mon, 26 Feb 2018 15:06:49 +0100
Subject: [PATCH] add a variable to indiciate whether or not the lib has been
found with pkg-config
---
modules/find/FindCHAMELEON.cmake | 18 ++++++++++--------
modules/find/FindEZTRACE.cmake | 12 +++++++++---
modules/find/FindFFTW.cmake | 11 +++++++++--
modules/find/FindFXT.cmake | 13 ++++++++++---
modules/find/FindGTG.cmake | 13 ++++++++++---
modules/find/FindHQR.cmake | 13 +++++++++----
modules/find/FindHWLOC.cmake | 18 ++++++++++--------
modules/find/FindPAPI.cmake | 13 ++++++++++---
modules/find/FindPARSEC.cmake | 13 ++++++++++---
modules/find/FindPETSc.cmake | 7 +++++++
modules/find/FindSIMGRID.cmake | 7 +++++++
modules/find/FindSTARPU.cmake | 17 +++++++++--------
12 files changed, 110 insertions(+), 45 deletions(-)
diff --git a/modules/find/FindCHAMELEON.cmake b/modules/find/FindCHAMELEON.cmake
index 60c0b5c..3b330ee 100644
--- a/modules/find/FindCHAMELEON.cmake
+++ b/modules/find/FindCHAMELEON.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2016 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -44,6 +44,7 @@
# CHAMELEON_INCLUDE_DIRS_DEP - chameleon + dependencies include directories
# CHAMELEON_LIBRARY_DIRS_DEP - chameleon + dependencies link directories
# CHAMELEON_LIBRARIES_DEP - chameleon libraries + dependencies
+# CHAMELEON_FOUND_WITH_PKGCONFIG - True if found with pkg-config
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DCHAMELEON_DIR=path/to/chameleon):
# CHAMELEON_DIR - Where to find the base directory of chameleon
@@ -53,11 +54,11 @@
# are not given as cmake variable: CHAMELEON_DIR, CHAMELEON_INCDIR, CHAMELEON_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2016 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -134,11 +135,6 @@ if(PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_GIVEN_BY_USER)
if (NOT CHAMELEON_FIND_QUIETLY)
if (CHAMELEON_FOUND AND CHAMELEON_LIBRARIES)
message(STATUS "Looking for CHAMELEON - found using PkgConfig")
- #if(NOT CHAMELEON_INCLUDE_DIRS)
- # message("${Magenta}CHAMELEON_INCLUDE_DIRS is empty using PkgConfig."
- # "Perhaps the path to chameleon headers is already present in your"
- # "C(PLUS)_INCLUDE_PATH environment variable.${ColourReset}")
- #endif()
else()
message(STATUS "${Magenta}Looking for CHAMELEON - not found using PkgConfig."
"\n Perhaps you should add the directory containing chameleon.pc"
@@ -172,6 +168,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_GIVEN_BY_USER)
set(CHAMELEON_LIBRARY_DIRS_DEP "${CHAMELEON_STATIC_LIBRARY_DIRS}")
set(CHAMELEON_LIBRARIES_DEP "${CHAMELEON_STATIC_LIBRARIES}")
+ if (CHAMELEON_FOUND AND CHAMELEON_LIBRARIES)
+ set(CHAMELEON_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(CHAMELEON_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR (CHAMELEON_GIVEN_BY_USER) )
diff --git a/modules/find/FindEZTRACE.cmake b/modules/find/FindEZTRACE.cmake
index 68f5106..f11ae61 100644
--- a/modules/find/FindEZTRACE.cmake
+++ b/modules/find/FindEZTRACE.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2014 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -24,6 +24,7 @@
# EZTRACE_INCLUDE_DIRS - eztrace include directories
# EZTRACE_LIBRARY_DIRS - Link directories for eztrace libraries
# EZTRACE_LIBRARIES - eztrace component libraries to be linked
+# EZTRACE_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DEZTRACE_DIR=path/to/eztrace):
@@ -34,11 +35,11 @@
# are not given as cmake variable: EZTRACE_DIR, EZTRACE_INCDIR, EZTRACE_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -85,6 +86,11 @@ if( PKG_CONFIG_EXECUTABLE AND NOT EZTRACE_GIVEN_BY_USER )
"\n Perhaps you should add the directory containing eztrace.pc to"
"\n the PKG_CONFIG_PATH environment variable.${ColourReset}")
endif()
+ if (EZTRACE_FOUND AND EZTRACE_LIBRARIES)
+ set(EZTRACE_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(EZTRACE_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
endif()
set(EZTRACE_C_FLAGS "${EZTRACE_CFLAGS_OTHER}")
diff --git a/modules/find/FindFFTW.cmake b/modules/find/FindFFTW.cmake
index 486cda3..00eb652 100644
--- a/modules/find/FindFFTW.cmake
+++ b/modules/find/FindFFTW.cmake
@@ -36,6 +36,7 @@
# FFTW_INCLUDE_DIRS_DEP - fftw + dependencies include directories
# FFTW_LIBRARY_DIRS_DEP - fftw + dependencies link directories
# FFTW_LIBRARIES_DEP - fftw libraries + dependencies
+# FFTW_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DFFTW_DIR=path/to/fftw):
@@ -48,11 +49,11 @@
# environment variable
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2016 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -355,6 +356,12 @@ if (NOT FFTW_LOOK_FOR_MKL AND NOT FFTW_LOOK_FOR_ESSL)
set(FFTW_WORKS TRUE)
endif()
+ if (FFTW_FOUND AND FFTW_LIBRARIES)
+ set(FFTW_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(FFTW_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif( PKG_CONFIG_EXECUTABLE AND NOT FFTW_GIVEN_BY_USER )
endif(NOT FFTW_LOOK_FOR_MKL AND NOT FFTW_LOOK_FOR_ESSL)
diff --git a/modules/find/FindFXT.cmake b/modules/find/FindFXT.cmake
index 81704c2..c9aa3ef 100644
--- a/modules/find/FindFXT.cmake
+++ b/modules/find/FindFXT.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2014 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -20,6 +20,7 @@
# FXT_INCLUDE_DIRS - fxt include directories
# FXT_LIBRARY_DIRS - Link directories for fxt libraries
# FXT_LIBRARIES - fxt component libraries to be linked
+# FXT_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DFXT_DIR=path/to/fxt):
@@ -30,11 +31,11 @@
# are not given as cmake variable: FXT_DIR, FXT_INCDIR, FXT_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -85,6 +86,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT FXT_GIVEN_BY_USER)
set(FXT_C_FLAGS "${FXT_CFLAGS_OTHER}")
+ if (FXT_FOUND AND FXT_LIBRARIES)
+ set(FXT_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(FXT_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT FXT_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT FXT_FOUND) OR (FXT_GIVEN_BY_USER) )
diff --git a/modules/find/FindGTG.cmake b/modules/find/FindGTG.cmake
index eda344b..d9ac5a0 100644
--- a/modules/find/FindGTG.cmake
+++ b/modules/find/FindGTG.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2017 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -20,6 +20,7 @@
# GTG_INCLUDE_DIRS - gtg include directories
# GTG_LIBRARY_DIRS - Link directories for gtg libraries
# GTG_LIBRARIES - gtg component libraries to be linked
+# GTG_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DGTG_DIR=path/to/gtg):
@@ -30,11 +31,11 @@
# are not given as cmake variable: GTG_DIR, GTG_INCDIR, GTG_LIBDIR
#=============================================================================
-# Copyright 2012-2017 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2017 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -85,6 +86,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT GTG_GIVEN_BY_USER)
set(GTG_C_FLAGS "${GTG_CFLAGS_OTHER}")
+ if (GTG_FOUND AND GTG_LIBRARIES)
+ set(GTG_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(GTG_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT GTG_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT GTG_FOUND) OR (GTG_GIVEN_BY_USER) )
diff --git a/modules/find/FindHQR.cmake b/modules/find/FindHQR.cmake
index 982c9c6..f3a8250 100644
--- a/modules/find/FindHQR.cmake
+++ b/modules/find/FindHQR.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2017 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -19,6 +19,7 @@
# HQR_INCLUDE_DIRS - hqr include directories
# HQR_LIBRARY_DIRS - Link directories for hqr libraries
# HQR_LIBRARIES - hqr component libraries to be linked
+# HQR_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DHQR_DIR=path/to/hqr):
@@ -29,11 +30,11 @@
# are not given as cmake variable: HQR_DIR, HQR_INCDIR, HQR_LIBDIR
#=============================================================================
-# Copyright 2012-2017 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2017 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -81,7 +82,11 @@ if(PKG_CONFIG_EXECUTABLE AND NOT HQR_GIVEN_BY_USER)
"\n PKG_CONFIG_PATH environment variable.${ColourReset}")
endif()
endif()
-
+ if (HQR_FOUND AND HQR_LIBRARIES)
+ set(HQR_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(HQR_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
endif(PKG_CONFIG_EXECUTABLE AND NOT HQR_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR (HQR_GIVEN_BY_USER) )
diff --git a/modules/find/FindHWLOC.cmake b/modules/find/FindHWLOC.cmake
index 5c868b2..adb59b7 100644
--- a/modules/find/FindHWLOC.cmake
+++ b/modules/find/FindHWLOC.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2014 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -20,6 +20,7 @@
# HWLOC_INCLUDE_DIRS - hwloc include directories
# HWLOC_LIBRARY_DIRS - Link directories for hwloc libraries
# HWLOC_LIBRARIES - hwloc component libraries to be linked
+# HWLOC_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DHWLOC_DIR=path/to/hwloc):
@@ -30,11 +31,11 @@
# are not given as cmake variable: HWLOC_DIR, HWLOC_INCDIR, HWLOC_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -74,11 +75,6 @@ if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
if (NOT HWLOC_FIND_QUIETLY)
if (HWLOC_FOUND AND HWLOC_LIBRARIES)
message(STATUS "Looking for HWLOC - found using PkgConfig")
- #if(NOT HWLOC_INCLUDE_DIRS)
- # message("${Magenta}HWLOC_INCLUDE_DIRS is empty using PkgConfig."
- # "Perhaps the path to hwloc headers is already present in your"
- # "C(PLUS)_INCLUDE_PATH environment variable.${ColourReset}")
- #endif()
else()
message(STATUS "${Magenta}Looking for HWLOC - not found using PkgConfig."
"\n Perhaps you should add the directory containing hwloc.pc to"
@@ -88,6 +84,12 @@ if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
set(HWLOC_C_FLAGS "${HWLOC_CFLAGS_OTHER}")
+ if (HWLOC_FOUND AND HWLOC_LIBRARIES)
+ set(HWLOC_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(HWLOC_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) )
diff --git a/modules/find/FindPAPI.cmake b/modules/find/FindPAPI.cmake
index 0bc4048..a9745de 100644
--- a/modules/find/FindPAPI.cmake
+++ b/modules/find/FindPAPI.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2016 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -20,6 +20,7 @@
# PAPI_INCLUDE_DIRS - papi include directories
# PAPI_LIBRARY_DIRS - Link directories for papi libraries
# PAPI_LIBRARIES - papi component libraries to be linked
+# PAPI_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DPAPI_DIR=path/to/papi):
@@ -30,11 +31,11 @@
# are not given as cmake variable: PAPI_DIR, PAPI_INCDIR, PAPI_LIBDIR
#=============================================================================
-# Copyright 2012-2016 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2016 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -85,6 +86,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT PAPI_GIVEN_BY_USER)
set(PAPI_C_FLAGS "${PAPI_CFLAGS_OTHER}")
+ if (PAPI_FOUND AND PAPI_LIBRARIES)
+ set(PAPI_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(PAPI_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT PAPI_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PAPI_FOUND) OR (PAPI_GIVEN_BY_USER) )
diff --git a/modules/find/FindPARSEC.cmake b/modules/find/FindPARSEC.cmake
index b6768b2..d544cf4 100644
--- a/modules/find/FindPARSEC.cmake
+++ b/modules/find/FindPARSEC.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2015 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2015 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -39,6 +39,7 @@
# PARSEC_LIBRARIES_DEP - parsec libraries + dependencies
# PARSEC_parsec_ptgpp_BIN_DIR - path to parsec driver parsec_ptgpp
# PARSEC_PARSEC_PTGPP - parsec jdf compiler
+# PARSEC_FOUND_WITH_PKGCONFIG - True if found with pkg-config
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DPARSEC=path/to/parsec):
# PARSEC_DIR - Where to find the base directory of parsec
@@ -48,11 +49,11 @@
# are not given as cmake variable: PARSEC_DIR, PARSEC_INCDIR, PARSEC_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -259,6 +260,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT PARSEC_GIVEN_BY_USER)
endif()
endif()
+ if (PARSEC_FOUND AND PARSEC_LIBRARIES)
+ set(PARSEC_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(PARSEC_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT PARSEC_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PARSEC_FOUND) OR (PARSEC_GIVEN_BY_USER) )
diff --git a/modules/find/FindPETSc.cmake b/modules/find/FindPETSc.cmake
index c38f253..d6e2893 100644
--- a/modules/find/FindPETSc.cmake
+++ b/modules/find/FindPETSc.cmake
@@ -48,6 +48,8 @@
# <PREFIX> = PETSC for common case
# <PREFIX> = PETSC_STATIC for static linking
#
+# PETSC_FOUND_WITH_PKGCONFIG - True if found with pkg-config
+#
# find_package(PETSc [QUIET] [REQUIRED])
#
# Setting these changes the behavior of the search
@@ -77,6 +79,11 @@ if( PKG_CONFIG_EXECUTABLE AND NOT PETSC_DIR )
endif()
endif()
set(PETSC_DIR "${PETSC_PREFIX}")
+ if (PETSC_FOUND AND PETSC_LIBRARIES)
+ set(PETSC_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(PETSC_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
endif()
# consider using the env. var. PETSC_DIR if not directly given through the CMake cache var.
diff --git a/modules/find/FindSIMGRID.cmake b/modules/find/FindSIMGRID.cmake
index 82f8481..6d0d04e 100644
--- a/modules/find/FindSIMGRID.cmake
+++ b/modules/find/FindSIMGRID.cmake
@@ -20,6 +20,7 @@
# SIMGRID_INCLUDE_DIRS - simgrid include directories
# SIMGRID_LIBRARY_DIRS - Link directories for simgrid libraries
# SIMGRID_LIBRARIES - simgrid component libraries to be linked
+# SIMGRID_FOUND_WITH_PKGCONFIG - True if found with pkg-config
#
# The user can give specific paths where to find the libraries adding cmake
# options at configure (ex: cmake path/to/project -DSIMGRID_DIR=path/to/simgrid):
@@ -85,6 +86,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT SIMGRID_GIVEN_BY_USER)
set(SIMGRID_C_FLAGS "${SIMGRID_CFLAGS_OTHER}")
+ if (SIMGRID_FOUND AND SIMGRID_LIBRARIES)
+ set(SIMGRID_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(SIMGRID_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif(PKG_CONFIG_EXECUTABLE AND NOT SIMGRID_GIVEN_BY_USER)
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT SIMGRID_FOUND) OR (SIMGRID_GIVEN_BY_USER) )
diff --git a/modules/find/FindSTARPU.cmake b/modules/find/FindSTARPU.cmake
index 9a2b710..27fae1b 100644
--- a/modules/find/FindSTARPU.cmake
+++ b/modules/find/FindSTARPU.cmake
@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation.
# All rights reserved.
-# @copyright (c) 2012-2017 Inria. All rights reserved.
+# @copyright (c) 2012-2018 Inria. All rights reserved.
# @copyright (c) 2012-2016 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
#
###
@@ -51,11 +51,11 @@
# are not given as cmake variable: STARPU_DIR, STARPU_INCDIR, STARPU_LIBDIR
#=============================================================================
-# Copyright 2012-2013 Inria
+# Copyright 2012-2018 Inria
# Copyright 2012-2013 Emmanuel Agullo
# Copyright 2012-2013 Mathieu Faverge
# Copyright 2012 Cedric Castagnede
-# Copyright 2013-2017 Florent Pruvost
+# Copyright 2013-2018 Florent Pruvost
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file MORSE-Copyright.txt for details.
@@ -227,11 +227,6 @@ if(PKG_CONFIG_EXECUTABLE AND NOT STARPU_GIVEN_BY_USER)
if (NOT STARPU_FIND_QUIETLY)
if (STARPU_SHM_FOUND AND STARPU_SHM_LIBRARIES)
message(STATUS "Looking for STARPU - found using PkgConfig")
- #if(NOT STARPU_SHM_INCLUDE_DIRS)
- # message("${Magenta}STARPU_SHM_INCLUDE_DIRS is empty using PkgConfig."
- # "Perhaps the path to starpu headers is already present in your"
- # "C(PLUS)_INCLUDE_PATH environment variable.${ColourReset}")
- #endif()
set(STARPU_VERSION_STRING "${STARPU_SHM_VERSION}")
string(REPLACE "." ";" STARPU_VERSION_STRING_LIST ${STARPU_VERSION_STRING})
list(GET STARPU_VERSION_STRING_LIST 0 STARPU_VERSION_MAJOR)
@@ -273,6 +268,12 @@ if(PKG_CONFIG_EXECUTABLE AND NOT STARPU_GIVEN_BY_USER)
endif()
endif()
+ if (STARPU_SHM_FOUND AND STARPU_SHM_LIBRARIES)
+ set(STARPU_FOUND_WITH_PKGCONFIG "TRUE")
+ else()
+ set(STARPU_FOUND_WITH_PKGCONFIG "FALSE")
+ endif()
+
endif()
if(STARPU_MPI_LIBRARIES)
--
GitLab