From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 3 Nov 2015 23:09:34 +0000 (+0100)
Subject: Fix out-of-tree builds after 3203ed1, sorry
X-Git-Tag: v3_13~1598
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f463baf627d76634a29ab57714f4cd138f493432?hp=8477291df42541085fa7c670fd39ba16dfa8860e

Fix out-of-tree builds after 3203ed1, sorry

(fix #32)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f793f39940..3904250ed0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,7 @@ set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include
   ${CMAKE_HOME_DIRECTORY}/src/include
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/include
   )
 
diff --git a/src/portable.h b/src/portable.h
index d3d435ba7d..7ccd0a7d64 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -10,7 +10,7 @@
 #ifndef SIMGRID_PORTABLE_H
 #define SIMGRID_PORTABLE_H
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "xbt/base.h"
 #include "xbt/misc.h"
 #ifdef _XBT_WIN32
diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index b48640365f..8208fe5194 100644
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -676,7 +676,7 @@ void xbt_dict_postexit(void)
 #ifdef SIMGRID_TEST
 #include "xbt.h"
 #include "xbt/ex.h"
-#include "portable.h"
+#include "src/portable.h"
 
 #define PRINTF_STR(a) (a)?:"(null)"
 
diff --git a/src/xbt/xbt_sha.c b/src/xbt/xbt_sha.c
index e2973ca8c8..d6223e2692 100644
--- a/src/xbt/xbt_sha.c
+++ b/src/xbt/xbt_sha.c
@@ -177,7 +177,7 @@ static void sha_calculate(xbt_sha_t sha)
 /* ************* */
 #ifdef SIMGRID_TEST
 #include "xbt/hash.h"
-#include "portable.h"           /* hexa_str */
+#include "src/portable.h"           /* hexa_str */
 
 static char *mycmp(const char *p1, const char *p2, size_t n)
 {