and another .def.in for the verbose mode handling

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 612ff1a..e746427 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -253,6 +253,11 @@ if(WIN32)
        else(DBUS_BUILD_TESTS)
                set(DBUS_CLIENT_TEST_EXPORTS )
        endif(DBUS_BUILD_TESTS)
+       if (DBUS_ENABLE_VERBOSE_MODE)
+               file(READ "${DBUS_DIR}/dbus-1-verbosesymbols.def.in" DBUS_VERBOSE_EXPORTS)
+       else(DBUS_ENABLE_VERBOSE_MODE)
+               set(DBUS_VERBOSE_EXPORTS )
+       endif(DBUS_ENABLE_VERBOSE_MODE)
        set(DBUS_LIB_DEF "${CMAKE_BINARY_DIR}/dbus-1.def")
        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" ${DBUS_LIB_DEF})
        if(MSVC)

diff --git a/dbus/dbus-1-symbols.def.in b/dbus/dbus-1-symbols.def.in
index a2de2dd..f1eaafe 100644 (file)
--- a/dbus/dbus-1-symbols.def.in
+++ b/dbus/dbus-1-symbols.def.in
@@ -183,7 +183,6 @@ _dbus_header_set_field_basic
 _dbus_header_set_serial
 _dbus_header_toggle_flag
 _dbus_header_update_lengths
-_dbus_is_verbose_real
 _dbus_keyring_get_best_key
 _dbus_keyring_get_hex_key
 _dbus_keyring_is_for_credentials
@@ -500,8 +499,6 @@ _dbus_validate_signature
 _dbus_validate_signature_with_reason
 _dbus_verbose_bytes
 _dbus_verbose_bytes_of_string
-_dbus_verbose_real
-_dbus_verbose_reset_real
 _dbus_warn
 _dbus_warn_check_failed
 _dbus_watch_invalidate

diff --git a/dbus/dbus-1-verbosesymbols.def.in b/dbus/dbus-1-verbosesymbols.def.in
new file mode 100644 (file)
index 0000000..ee5411c
--- /dev/null
+++ b/dbus/dbus-1-verbosesymbols.def.in
@@ -0,0 +1,3 @@
+_dbus_is_verbose_real
+_dbus_verbose_real
+_dbus_verbose_reset_real

diff --git a/dbus/dbus-1.def.cmake b/dbus/dbus-1.def.cmake
index 78220e3..27c7267 100644 (file)
--- a/dbus/dbus-1.def.cmake
+++ b/dbus/dbus-1.def.cmake
@@ -1,3 +1,4 @@
 EXPORTS
 @DBUS_CLIENT_EXPORTS@
 @DBUS_CLIENT_TEST_EXPORTS@
+@DBUS_VERBOSE_EXPORTS@
\ No newline at end of file