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 master into mc-process
[simgrid.git]
/
buildtools
/
Cmake
/
src
/
internal_config.h.in
diff --git
a/buildtools/Cmake/src/internal_config.h.in
b/buildtools/Cmake/src/internal_config.h.in
index
6bb2129
..
577178a
100644
(file)
--- a/
buildtools/Cmake/src/internal_config.h.in
+++ b/
buildtools/Cmake/src/internal_config.h.in
@@
-3,12
+3,12
@@
/* This file is AUTOMATICALLY GENERATED by Cmake. Edit the following
template instead buildtools/Cmake/src/internal_config.h.in */
/* This file is AUTOMATICALLY GENERATED by Cmake. Edit the following
template instead buildtools/Cmake/src/internal_config.h.in */
-/* Copyright (c) 2004-2013. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-
/* Set somes variables for Windows compilation */
#ifdef _XBT_DLL_EXPORT
/* Set somes variables for Windows compilation */
#ifdef _XBT_DLL_EXPORT
@@
-57,12
+57,12
@@
#cmakedefine MMALLOC_WANT_OVERRIDE_LEGACY @MMALLOC_WANT_OVERRIDE_LEGACY@
#cmakedefine HAVE_MC @HAVE_MC@
#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@
-
/* If have linux_futex.h */
#cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@
/* If have linux_futex.h */
#cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@
+/* Some variable for libsigc++ */
+#cmakedefine HAVE_LIBSIGC @HAVE_LIBSIGC++@
+
/* Some variable for graphviz */
#cmakedefine HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@
#cmakedefine HAVE_GRAPH_H @GRAPH_H@
/* Some variable for graphviz */
#cmakedefine HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@
#cmakedefine HAVE_GRAPH_H @GRAPH_H@
@@
-126,9
+126,15
@@
/* Define to 1 if you have the <execinfo.h> header file. */
#cmakedefine HAVE_EXECINFO_H @HAVE_EXECINFO_H@
/* Define to 1 if you have the <execinfo.h> header file. */
#cmakedefine HAVE_EXECINFO_H @HAVE_EXECINFO_H@
-/* Define to 1 if you have the `mmap' function. */
+/* Define to 1 if mmalloc is compiled in. */
+#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
+
+/* Define to 1 if mmap is available */
#cmakedefine HAVE_MMAP @HAVE_MMAP@
#cmakedefine HAVE_MMAP @HAVE_MMAP@
+/* Define to 1 if process_vm_readv is available */
+#cmakedefine HAVE_PROCESS_VM_READV @HAVE_PROCESS_VM_READV@
+
/* Define to 1 if you have the `getdtablesize' function. */
#cmakedefine HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@
/* Define to 1 if you have the `getdtablesize' function. */
#cmakedefine HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@
@@
-144,8
+150,8
@@
/* Indicates that we have SMPI support */
#cmakedefine HAVE_SMPI @HAVE_SMPI@
/* Indicates that we have SMPI support */
#cmakedefine HAVE_SMPI @HAVE_SMPI@
-/* Indicates that we have SMPI F
2C
support */
-#cmakedefine SMPI_F
2C @SMPI_F2C
@
+/* Indicates that we have SMPI F
ORTRAN
support */
+#cmakedefine SMPI_F
ORTRAN @SMPI_FORTRAN
@
/* Indicates that we have NS3 support */
#cmakedefine HAVE_NS3 @HAVE_NS3@
/* Indicates that we have NS3 support */
#cmakedefine HAVE_NS3 @HAVE_NS3@
@@
-284,9
+290,6
@@
/* define for stack growth */
#cmakedefine PTH_STACKGROWTH @PTH_STACKGROWTH@
/* define for stack growth */
#cmakedefine PTH_STACKGROWTH @PTH_STACKGROWTH@
-/* enable the getline replacement */
-#cmakedefine SIMGRID_NEED_GETLINE @SIMGRID_NEED_GETLINE@
-
/* The maximal size of any scalar on this arch */
#cmakedefine SIZEOF_MAX @SIZEOF_MAX@
/* The maximal size of any scalar on this arch */
#cmakedefine SIZEOF_MAX @SIZEOF_MAX@