diff --git a/.gitlab-ci-env.sh b/.gitlab-ci-env.sh
index 26096fece72842b28d511637398499b64a807636..66128ab8eb3e9baa4441c4335bc7daa21787ad82 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 de8df69df660c388518ce08b652504db6f4d024f..a0d7193ad1ba20a3a81906705cbe0835a4b09837 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)
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index be970c0169f847f9a61993d2e6a7cd49a409399e..877ae16b52fb4e1c9f3dbc937fc34f68855dd1f7 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit be970c0169f847f9a61993d2e6a7cd49a409399e
+Subproject commit 877ae16b52fb4e1c9f3dbc937fc34f68855dd1f7