biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move some defines to gmxpre.h for thread-MPI
[alexxy/gromacs.git]
/
src
/
config.h.cmakein
diff --git
a/src/config.h.cmakein
b/src/config.h.cmakein
index 4fdf9d7369a3755e0fa73ef3a751dd3a2590dc6b..4dffa2952a5f61382eb1f66d7fc155b671c62bc0 100644
(file)
--- a/
src/config.h.cmakein
+++ b/
src/config.h.cmakein
@@
-43,6
+43,7
@@
*/
#ifndef GMX_CONFIG_H
#define GMX_CONFIG_H
*/
#ifndef GMX_CONFIG_H
#define GMX_CONFIG_H
+
#include "gromacs/utility/gmx_header_config.h"
/* TODO: For now, disable Doxygen warnings from here */
#include "gromacs/utility/gmx_header_config.h"
/* TODO: For now, disable Doxygen warnings from here */
@@
-199,7
+200,10
@@
#cmakedefine TMPI_ATOMICS
/* Define for busy wait option */
#cmakedefine TMPI_ATOMICS
/* Define for busy wait option */
+/* See gmxpre-config.h.cmakein for explanation for the #ifdef */
+#ifndef TMPI_WAIT_FOR_NO_ONE
#cmakedefine TMPI_WAIT_FOR_NO_ONE
#cmakedefine TMPI_WAIT_FOR_NO_ONE
+#endif
/* Define for copy buffer option */
#cmakedefine TMPI_COPY_BUFFER
/* Define for copy buffer option */
#cmakedefine TMPI_COPY_BUFFER
@@
-339,6
+343,6
@@
/* Define if we have zlib */
#cmakedefine HAVE_ZLIB
/* Define if we have zlib */
#cmakedefine HAVE_ZLIB
-#endif
-
/*! \endcond */
/*! \endcond */
+
+#endif