A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[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
9078297
..
fe82221
100644
(file)
--- a/
buildtools/Cmake/gras_config.h.in
+++ b/
buildtools/Cmake/gras_config.h.in
@@
-4,15
+4,27
@@
/* Set somes variables for Windows compilation */
#ifdef _XBT_DLL_EXPORT
/* 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
#else
#ifdef _XBT_DLL_STATIC
- #define DLL_STATIC
+ #ifndef DLL_STATIC
+ #define DLL_STATIC
+ #endif
#else
#else
- #define DLL_IMPORT
+ #ifndef DLL_EXPORT
+ #define DLL_IMPORT
+ #endif
#endif
#endif
#endif
#endif
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+#cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
+
+/* If __thread is available */
+#cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@
+
#ifndef __STRICT_ANSI__
#cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@
#endif
#ifndef __STRICT_ANSI__
#cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@
#endif
@@
-27,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 _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__@
#ifdef _XBT_WIN32
#ifndef __GNUC__
#cmakedefine __GNUC__ @__GNUC__@
@@
-36,8
+49,11
@@
#cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@
#cmakedefine HAVE_MC @HAVE_MC@
#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@
/* Some variable for graphviz */
#cmakedefine HAVE_GRAPH_H @GRAPH_H@
/* Some variable for graphviz */
#cmakedefine HAVE_GRAPH_H @GRAPH_H@
@@
-90,6
+106,7
@@
#cmakedefine PROCESSOR_i686 @PROCESSOR_i686@
#cmakedefine PROCESSOR_x86_64 @PROCESSOR_x86_64@
#cmakedefine CMAKE_SYSTEM_PROCESSOR @CMAKE_SYSTEM_PROCESSOR@
#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
/* Defined if arrays in struct can straddle struct alignment boundaries. This
is like than the structure compaction above, but this time, the argument to
@@
-135,17
+152,14
@@
/* Indicates that we have GTNETS support */
#cmakedefine HAVE_GTNETS @HAVE_GTNETS@
/* Indicates that we have GTNETS support */
#cmakedefine HAVE_GTNETS @HAVE_GTNETS@
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
-
-/* defines whether Java bindings must be compiled or not */
-#cmakedefine HAVE_JAVA @HAVE_JAVA@
+/* Indicates that we have SMPI support */
+#cmakedefine HAVE_SMPI @HAVE_SMPI@
-/*
Define to 1 if you have the <jni.h> header file.
*/
-#cmakedefine HAVE_
JNI_H @HAVE_JNI_H
@
+/*
Indicates that we have NS3 support
*/
+#cmakedefine HAVE_
NS3 @HAVE_NS3
@
-/*
defines whether Ruby bindings must be compiled or not
*/
-#cmakedefine HAVE_
RUBY @HAVE_RUBY
@
+/*
Define to 1 if you have the <inttypes.h> header file.
*/
+#cmakedefine HAVE_
INTTYPES_H @HAVE_INTTYPES_H
@
/* defines whether Lua bindings must be compiled or not */
#cmakedefine HAVE_LUA @HAVE_LUA@
/* defines whether Lua bindings must be compiled or not */
#cmakedefine HAVE_LUA @HAVE_LUA@
@@
-332,4
+346,4
@@
#endif
/* Define to `unsigned int' if <sys/types.h> does not define. */
#endif
/* Define to `unsigned int' if <sys/types.h> does not define. */
-#cmakedefine size_t @size_t@
\ No newline at end of file
+#cmakedefine size_t @size_t@