From 2e5eb7d82f72fcb9044ecf57fa769343d86fdfa5 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Tue, 25 Jun 2013 15:37:27 +0800 Subject: [PATCH] cmake: fix a typo DBUS_DISABLE_ASSERTS should be DBUS_DISABLE_ASSERT Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66142 Signed-off-by: Chengwei Yang Reviewed-by: Simon McVittie --- README.cmake | 2 +- cmake/CMakeLists.txt | 16 ++++++++-------- cmake/config.h.cmake | 2 +- dbus/dbus-sysdeps-win.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.cmake b/README.cmake index 9415a82..376dac0 100644 --- a/README.cmake +++ b/README.cmake @@ -103,7 +103,7 @@ DBUS_BUILD_TESTS:BOOL=ON DBUS_DAEMON_NAME:STRING=dbus-daemon // Disable assertion checking -DBUS_DISABLE_ASSERTS:BOOL=OFF +DBUS_DISABLE_ASSERT:BOOL=OFF // Disable public API sanity checking DBUS_DISABLE_CHECKS:BOOL=OFF diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index ed1df56..9e8bade 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -96,7 +96,7 @@ if(NOT WIN32) endif(NOT WIN32) #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE) -option (DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF) +option (DBUS_DISABLE_ASSERT "Disable assertion checking" OFF) option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF) @@ -161,12 +161,12 @@ if(WIN32) endif(MSVC) endif(WIN32) -if (UNIX AND NOT DBUS_DISABLE_ASSERTS) +if (UNIX AND NOT DBUS_DISABLE_ASSERT) # required for backtrace SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic") add_definitions(-DDBUS_BUILT_R_DYNAMIC) -endif (UNIX AND NOT DBUS_DISABLE_ASSERTS) +endif (UNIX AND NOT DBUS_DISABLE_ASSERT) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") @@ -559,7 +559,7 @@ message(" Docbook Generator: ${DOCBOOK_GENERATOR_NAME} " message(" gcc coverage profiling: ${DBUS_GCOV_ENABLED} ") message(" Building unit tests: ${DBUS_BUILD_TESTS} ") message(" Building verbose mode: ${DBUS_ENABLE_VERBOSE_MODE} ") -message(" Building w/o assertions: ${DBUS_DISABLE_ASSERTS} ") +message(" Building w/o assertions: ${DBUS_DISABLE_ASSERT} ") message(" Building w/o checks: ${DBUS_DISABLE_CHECKS} ") message(" Building bus stats API: ${DBUS_ENABLE_STATS} ") message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} ") @@ -595,9 +595,9 @@ if (DBUS_BUILD_TESTS) message("NOTE: building with unit tests increases the size of the installed library and renders it insecure.") endif(DBUS_BUILD_TESTS) -if (DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERTS) +if (DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERT) message("NOTE: building with unit tests but without assertions means tests may not properly report failures (this configuration is only useful when doing something like profiling the tests)") -endif(DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERTS) +endif(DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERT) if (DBUS_GCOV_ENABLED) message("NOTE: building with coverage profiling is definitely for developers only.") @@ -607,9 +607,9 @@ if (DBUS_ENABLE_VERBOSE_MODE) message("NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance.") endif(DBUS_ENABLE_VERBOSE_MODE) -if(NOT DBUS_DISABLE_ASSERTS) +if(NOT DBUS_DISABLE_ASSERT) message("NOTE: building with assertions increases library size and decreases performance.") -endif(NOT DBUS_DISABLE_ASSERTS) +endif(NOT DBUS_DISABLE_ASSERT) if (DBUS_DISABLE_CHECKS) message("NOTE: building without checks for arguments passed to public API makes it harder to debug apps using D-BUS, but will slightly decrease D-BUS library size and _very_ slightly improve performance.") diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 91cf080..f3829cc 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -42,7 +42,7 @@ #cmakedefine DBUS_BUILD_TESTS 1 #cmakedefine DBUS_ENABLE_ANSI 1 #cmakedefine DBUS_ENABLE_VERBOSE_MODE 1 -#cmakedefine DBUS_DISABLE_ASSERTS 1 +#cmakedefine DBUS_DISABLE_ASSERT 1 #cmakedefine DBUS_DISABLE_CHECKS 1 /* xmldocs */ /* doxygen */ diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 72ccb93..6621af7 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -2221,7 +2221,7 @@ _dbus_replace_install_prefix (const char *configure_time_path) #endif } -#if !defined (DBUS_DISABLE_ASSERTS) || defined(DBUS_BUILD_TESTS) +#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS) #if defined(_MSC_VER) || defined(DBUS_WINCE) # ifdef BACKTRACES -- 2.7.4