From: Ralf Habacker Date: Sun, 21 Oct 2018 13:18:50 +0000 (+0200) Subject: Move DBUS_BUILT_R_DYNAMIC to config.h.cmake X-Git-Tag: dbus-1.13.20~32^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541dbab907938e3bb1836e8994680d303f16381c;p=thirdparty%2Fdbus.git Move DBUS_BUILT_R_DYNAMIC to config.h.cmake --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c18bb2d9c..44b437c16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,7 +293,7 @@ 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) + set(DBUS_BUILT_R_DYNAMIC 1) endif() if(DBUS_WITH_GLIB) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 443db0ca6..b6532b133 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -240,6 +240,9 @@ #cmakedefine HAVE_VASPRINTF 1 #cmakedefine HAVE_VSNPRINTF 1 +/* whether -export-dynamic was passed to libtool */ +#cmakedefine DBUS_BUILT_R_DYNAMIC 1 + // structs /* Define to 1 if you have struct cmsgred */ #cmakedefine HAVE_CMSGCRED 1