From 5b4df058db2ccb5c1ff86c34b8dc1031fa4f441b Mon Sep 17 00:00:00 2001
From: Luka Stanisic <luka.stanisic@inria.fr>
Date: Tue, 8 Mar 2016 13:52:53 +0100
Subject: [PATCH] using environment variable for simgrid include

---
 CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68540894..534f0ce2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -516,9 +516,13 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
     message(STATUS "         STARPU_LIBRARIES          = ${STARPU_LIBRARIES}")
     if (STARPU_INCLUDE_DIRS)
       message(STATUS "         STARPU_INCLUDES           = ${STARPU_INCLUDE_DIRS}")
-      set(SCALFMM_INCLUDES  "${SCALFMM_INCLUDES}; ${STARPU_INCLUDE_DIRS}; /home/stanisic/Work/simgrid/build/include")
+      set(SCALFMM_INCLUDES  "${SCALFMM_INCLUDES}; ${STARPU_INCLUDE_DIRS}")
     endif()
 
+    # Adding SimGrid includes
+    set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES};$ENV{SIMGRID_INCLUDE}")
+    message(STATUS "         Adding SIMGRID           = $ENV{SIMGRID_INCLUDE}")
+
     # TODO: replace this by a component of find starpu
     OPTION( SCALFMM_USE_OPENCL      "Set to ON to use OPENCL with StarPU" OFF )
     MESSAGE( STATUS "SCALFMM_USE_OPENCL             = ${SCALFMM_USE_OPENCL}" )
-- 
GitLab