fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-04 19:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for Visual Studio 2010 cmake generator - reported by Ray Satiro.

Browse source
This commit is contained in:
Ralf Habacker 2011-05-28 13:59:50 +02:00
parent 6d2b67fc03
commit b1e28fba0b
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/CMakeLists.txt
View file

@ -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 ###############

4
cmake/config.h.cmake
View file

@ -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

3
dbus/dbus-internals.c
View file

@ -301,9 +301,6 @@ static dbus_bool_t verbose = TRUE;
#include <pthread.h>
#endif
#ifdef _MSC_VER
#define inline
#endif
#ifdef DBUS_USE_OUTPUT_DEBUG_STRING
static char module_name[1024];
#endif