X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89cdc268b64c4e453f9e4bf4fc1c8defb8a1e331..1bcbbd87509050edcb2accd6ba00134f968323c3:/buildtools/Cmake/gras_config.h.in

diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index c58ef93b74..e637923e2f 100644
--- a/buildtools/Cmake/gras_config.h.in
+++ b/buildtools/Cmake/gras_config.h.in
@@ -4,12 +4,18 @@
 /* Set somes variables for Windows compilation */
 
 #ifdef _XBT_DLL_EXPORT
-	#define DLL_EXPORT
+	#ifndef DLL_EXPORT
+		#define DLL_EXPORT
+	#endif
 #else
 	#ifdef _XBT_DLL_STATIC
-		#define DLL_STATIC
+		#ifndef DLL_STATIC
+			#define DLL_STATIC
+		#endif
 	#else
-		#define DLL_IMPORT
+		#ifndef DLL_EXPORT
+			#define DLL_IMPORT
+		#endif
 	#endif
 #endif
 
@@ -40,19 +46,17 @@
 	#endif
 #endif
 /* Set to true if enable_model-checking is true */
-#cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@
+#cmakedefine MMALLOC_WANT_OVERRIDE_LEGACY @MMALLOC_WANT_OVERRIDE_LEGACY@
 #cmakedefine HAVE_MC @HAVE_MC@
 
 /* Set to true if have the mergesort function */
 #cmakedefine HAVE_MERGESORT @HAVE_MERGESORT@
 
-/* Set to true if lib pcre is present */
-#cmakedefine HAVE_PCRE_LIB @HAVE_PCRE_LIB@
-
 /* If have linux_futex.h */
 #cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@
 
 /* Some variable for graphviz */
+#cmakedefine HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@
 #cmakedefine HAVE_GRAPH_H @GRAPH_H@
 #cmakedefine HAVE_CGRAPH_H @CGRAPH_H@
 #cmakedefine HAVE_AGRAPH_H @AGRAPH_H@
@@ -149,6 +153,9 @@
 /* Indicates that we have GTNETS support */
 #cmakedefine HAVE_GTNETS @HAVE_GTNETS@
 
+/* Indicates that we have SMPI support */
+#cmakedefine HAVE_SMPI @HAVE_SMPI@
+
 /* Indicates that we have NS3 support */
 #cmakedefine HAVE_NS3 @HAVE_NS3@