From b11191d7ec202ae5d3ece3b179551d62708a9379 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Wed, 2 Sep 2020 17:44:02 +0200
Subject: [PATCH] Improve Simgrid detection
---
.gitlab-ci-env.sh | 1 +
CMakeLists.txt | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/.gitlab-ci-env.sh b/.gitlab-ci-env.sh
index 26096fece..66128ab8e 100755
--- a/.gitlab-ci-env.sh
+++ b/.gitlab-ci-env.sh
@@ -11,6 +11,7 @@ export STARPU_SILENT=1
# if simgrid change the default starpu dir to use
if [ "$1" == "simu" ]; then
export STARPU_DIR=$STARPUSIMGRID_DIR
+ export PKG_CONFIG_PATH=$SIMGRID_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
fi
# for build: better to rely on pkg-config than to guess libraries with the env. var.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de8df69df..a0d7193ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -506,6 +506,10 @@ else (NOT CHAMELEON_SIMULATION)
# Simulation mode: we depend on SimGrid
find_package(SIMGRID REQUIRED)
+ if (SIMGRID_INCLUDE_DIRS)
+ include_directories(${SIMGRID_INCLUDE_DIRS})
+ endif()
+
# CHAMELEON depends on MPI
#-------------------------
if (CHAMELEON_USE_MPI)
--
GitLab