add the LIBRARY header in the .def file, but for mingw only, msvc doesn't support...

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index e746427..7768874 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -258,10 +258,20 @@ if(WIN32)
        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)
+               set(DBUS_LIB_DEF "${CMAKE_BINARY_DIR}/dbus-1.def")
+               configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" ${DBUS_LIB_DEF})
                list(APPEND DBUS_LIB_SOURCES ${DBUS_LIB_DEF})
+       else(MSVC)
+               # Doesn't cmake support recursive expansion ? Would make the code below simpler...
+               if(CMAKE_BUILD_TYPE STREQUAL Debug)
+                       set(LIBDBUS_1_NAME "libdbus-1${CMAKE_DEBUG_POSTFIX}")
+               else(CMAKE_BUILD_TYPE STREQUAL Debug)
+                       set(LIBDBUS_1_NAME "libdbus-1${CMAKE_RELEASE_POSTFIX}")
+               endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+               set(DBUS_LIBRARY_HEADER "LIBRARY ${LIBDBUS_1_NAME}.dll")
+               set(DBUS_LIB_DEF "${CMAKE_BINARY_DIR}/${LIBDBUS_1_NAME}.def")
+               configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" ${DBUS_LIB_DEF})
        endif(MSVC)
 endif(WIN32)
 

diff --git a/dbus/dbus-1.def.cmake b/dbus/dbus-1.def.cmake
index 27c7267..0979b7a 100644 (file)
--- a/dbus/dbus-1.def.cmake
+++ b/dbus/dbus-1.def.cmake
@@ -1,3 +1,4 @@
+@DBUS_LIBRARY_HEADER@
 EXPORTS
 @DBUS_CLIENT_EXPORTS@
 @DBUS_CLIENT_TEST_EXPORTS@