diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-06-25 15:37:27 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-25 12:25:51 +0100 |
| commit | 2e5eb7d82f72fcb9044ecf57fa769343d86fdfa5 (patch) | |
| tree | 15d0c931d02a5dda400cd99a210caa285b622f0e /cmake | |
| parent | 147a65270d1b7fce7a24e5565c6791975b51256d (diff) | |
| download | dbus-2e5eb7d82f72fcb9044ecf57fa769343d86fdfa5.tar.gz | |
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 <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index ed1df562..9e8bade5 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 91cf0806..f3829cc3 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 */ |