Revert "Put PROCESSOR_COUNT in gras_config.h"

[simgrid.git] / buildtools / Cmake / gras_config.h.in

diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index 2443ae7..fe82221 100644 (file)
--- 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
 
@@ -33,6 +39,7 @@
 #cmakedefine _WIN64 @_WIN64@                   //this variable is set if it is a 64 bits  windows platform
 #cmakedefine __VISUALC__ @__VISUALC__@
 #cmakedefine __BORLANDC__ @__BORLANDC__@
+#cmakedefine APPLE @APPLE@
 #ifdef _XBT_WIN32
        #ifndef __GNUC__
                #cmakedefine __GNUC__ @__GNUC__@
@@ -42,8 +49,8 @@
 #cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@
 #cmakedefine HAVE_MC @HAVE_MC@
 
-/* Set to true if lib pcre is present */
-#cmakedefine HAVE_PCRE_LIB @HAVE_PCRE_LIB@
+/* Set to true if have the mergesort function */
+#cmakedefine HAVE_MERGESORT @HAVE_MERGESORT@
 
 /* If have linux_futex.h */
 #cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@
@@ -99,6 +106,7 @@
 #cmakedefine PROCESSOR_i686 @PROCESSOR_i686@
 #cmakedefine PROCESSOR_x86_64 @PROCESSOR_x86_64@
 #cmakedefine CMAKE_SYSTEM_PROCESSOR @CMAKE_SYSTEM_PROCESSOR@
+#cmakedefine HAVE_RAWCTX @HAVE_RAWCTX@
 
 /* Defined if arrays in struct can straddle struct alignment boundaries. This
    is like than the structure compaction above, but this time, the argument to
@@ -144,6 +152,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@