|
 |
6e13bd8 |
diff -rupN --no-dereference dbus-1.14.8/CMakeLists.txt dbus-1.14.8-new/CMakeLists.txt
|
|
|
6e13bd8 |
--- dbus-1.14.8/CMakeLists.txt 2022-10-02 16:06:53.000000000 +0200
|
|
|
6e13bd8 |
+++ dbus-1.14.8-new/CMakeLists.txt 2023-06-15 08:57:25.764476730 +0200
|
|
|
3cd7030 |
@@ -118,7 +118,8 @@ set(DBUS_LIBEXECDIR ${CMAKE_INS
|
|
|
3cd7030 |
set(DBUS_DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
|
|
|
3cd7030 |
|
|
|
3cd7030 |
#enable building of shared library
|
|
|
3cd7030 |
-set(BUILD_SHARED_LIBS ON)
|
|
|
3cd7030 |
+option(BUILD_SHARED_LIBS ON)
|
|
|
3cd7030 |
+add_definitions(-DDBUS_STATIC_BUILD)
|
|
|
3cd7030 |
|
|
|
3cd7030 |
set(INSTALL_TARGETS_DEFAULT_ARGS EXPORT DBus1Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
|
3cd7030 |
|
|
|
6e13bd8 |
diff -rupN --no-dereference dbus-1.14.8/dbus/CMakeLists.txt dbus-1.14.8-new/dbus/CMakeLists.txt
|
|
|
6e13bd8 |
--- dbus-1.14.8/dbus/CMakeLists.txt 2022-10-02 16:06:53.000000000 +0200
|
|
|
6e13bd8 |
+++ dbus-1.14.8-new/dbus/CMakeLists.txt 2023-06-15 08:57:25.764476730 +0200
|
|
|
3cd7030 |
@@ -262,13 +262,20 @@ find_library(LIBRT rt)
|
|
|
3cd7030 |
find_library(LIBSOCKET socket)
|
|
|
3cd7030 |
|
|
|
3cd7030 |
### Client library
|
|
|
3cd7030 |
+if(${BUILD_SHARED_LIBS})
|
|
|
3cd7030 |
add_library(dbus-1 SHARED
|
|
|
3cd7030 |
${libdbus_SOURCES}
|
|
|
3cd7030 |
${libdbus_HEADERS}
|
|
|
3cd7030 |
)
|
|
|
3cd7030 |
+else()
|
|
|
3cd7030 |
+add_library(dbus-1 STATIC
|
|
|
3cd7030 |
+ ${libdbus_SOURCES}
|
|
|
3cd7030 |
+ ${libdbus_HEADERS}
|
|
|
3cd7030 |
+)
|
|
|
3cd7030 |
+endif()
|
|
|
3cd7030 |
|
|
|
3cd7030 |
if(WIN32)
|
|
|
3cd7030 |
- if(DEFINED DBUS_LIBRARY_REVISION)
|
|
|
3cd7030 |
+ if(DEFINED DBUS_LIBRARY_REVISION AND BUILD_SHARED_LIBS)
|
|
|
3cd7030 |
set_target_properties(dbus-1 PROPERTIES SUFFIX "-${DBUS_LIBRARY_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
|
|
3cd7030 |
add_custom_command(TARGET dbus-1 POST_BUILD
|
|
|
3cd7030 |
COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:dbus-1>" "$<TARGET_FILE_DIR:dbus-1>/${CMAKE_SHARED_LIBRARY_PREFIX}dbus-1${CMAKE_SHARED_LIBRARY_SUFFIX}"
|