From b1e28fba0bcbd62d3cfbd6ce861de036d9d0537a Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 28 May 2011 13:59:50 +0200 Subject: [PATCH] Fixes for Visual Studio 2010 cmake generator - reported by Ray Satiro. --- cmake/CMakeLists.txt | 6 +++--- cmake/config.h.cmake | 4 ++++ dbus/dbus-internals.c | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 4a3f6d1..0a3652a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -439,8 +439,8 @@ set (DBUS_USER ) if (WIN32) - option (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "system bus default address" "nonce-tcp:") - option (DBUS_SESSION_BUS_DEFAULT_ADDRESS "session bus default address" "nonce-tcp:") + set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address" FORCE) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address" FORCE) set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf") set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf") @@ -456,7 +456,7 @@ else (WIN32) set (DBUS_USER "root") endif (WIN32) -option (DBUS_DAEMON_NAME "The name of the dbus daemon executable" dbus-daemon) +set (DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable" FORCE) ########### create config.h ############### diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index df3d45a..5220a8d 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -252,4 +252,8 @@ #define _dbus_verbose_C_S _dbus_verbose #endif +# if defined(_MSC_VER) && !defined(inline) +#define inline __inline +#endif + #endif // _DBUS_CONFIG_H diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index 5e864ce..95a491f 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -301,9 +301,6 @@ static dbus_bool_t verbose = TRUE; #include #endif -#ifdef _MSC_VER -#define inline -#endif #ifdef DBUS_USE_OUTPUT_DEBUG_STRING static char module_name[1024]; #endif -- 2.7.4