From fa1875e2f2f2250b91c755c3bb68b9a485ca40ce Mon Sep 17 00:00:00 2001 From: hsc Date: Tue, 20 Nov 2012 15:01:46 +0000 Subject: [PATCH] #cmakedefine does not make sense for non-binary configuration options For example, #cmakedefine CLIENT_RETRY_COUNT @CLIENT_RETRY_COUNT@ undefines CLIENT_RETRY_COUNT if the value is set to 0 (which evaluates to "false" in cmake). git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1941 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- src/core/config/FailConfig.hpp.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/config/FailConfig.hpp.in b/src/core/config/FailConfig.hpp.in index 63a8c4ad..85559b28 100644 --- a/src/core/config/FailConfig.hpp.in +++ b/src/core/config/FailConfig.hpp.in @@ -31,14 +31,14 @@ #cmakedefine CONFIG_FIRE_INTERRUPTS #cmakedefine CONFIG_DISABLE_KEYB_INTERRUPTS #cmakedefine SERVER_PERFORMANCE_MEASURE -#cmakedefine SERVER_COMM_HOSTNAME "@SERVER_COMM_HOSTNAME@" -#cmakedefine SERVER_COMM_TCP_PORT @SERVER_COMM_TCP_PORT@ -#cmakedefine SERVER_PERF_LOG_PATH "@SERVER_PERF_LOG_PATH@" -#cmakedefine SERVER_PERF_STEPPING_SEC @SERVER_PERF_STEPPING_SEC@ -#cmakedefine CLIENT_RAND_BACKOFF_TSTART @CLIENT_RAND_BACKOFF_TSTART@ -#cmakedefine CLIENT_RAND_BACKOFF_TEND @CLIENT_RAND_BACKOFF_TEND@ -#cmakedefine CLIENT_RETRY_COUNT @CLIENT_RETRY_COUNT@ -#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@" +#define SERVER_COMM_HOSTNAME "@SERVER_COMM_HOSTNAME@" +#define SERVER_COMM_TCP_PORT @SERVER_COMM_TCP_PORT@ +#define SERVER_PERF_LOG_PATH "@SERVER_PERF_LOG_PATH@" +#define SERVER_PERF_STEPPING_SEC @SERVER_PERF_STEPPING_SEC@ +#define CLIENT_RAND_BACKOFF_TSTART @CLIENT_RAND_BACKOFF_TSTART@ +#define CLIENT_RAND_BACKOFF_TEND @CLIENT_RAND_BACKOFF_TEND@ +#define CLIENT_RETRY_COUNT @CLIENT_RETRY_COUNT@ +#define PROJECT_VERSION "@PROJECT_VERSION@" #define FAIL_VERSION PROJECT_VERSION #endif // __FAIL_CONFIG_HPP__