From 8ab7f05a1933aa6fc53d9e95c4aa9aa6fccd2235 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 30 Nov 2009 16:01:19 +0100 Subject: [PATCH] fixed DBUS_VA_COPY for msvc --- cmake/CMakeLists.txt | 8 ++++++++ cmake/config.h.cmake | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index d4b26294..33a0a760 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -52,6 +52,14 @@ find_package(X11) OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON) +if (MINGW) + set (DBUS_VA_COPY_AS_ARRAY 1) +endif (MINGW) +if (MSVC) + set (DBUS_HAVE_VA_COPY 1) + set (DBUS_VA_COPY_AS_ARRAY 0) +endif (MSVC) + # do config checks INCLUDE(ConfigureChecks.cmake) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 3461338d..d3d59bae 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -87,7 +87,7 @@ #undef DBUS_VA_COPY_FUNC #endif -#cmakedefine DBUS_VA_COPY_AS_ARRAY 1 +#cmakedefine DBUS_VA_COPY_AS_ARRAY @DBUS_VA_COPY_AS_ARRAY@ // headers /* Define to 1 if you have dirent.h */