fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 10:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'complete-version-info-on-windows' into 'master'

Browse source 
cmake: complete adding version info to all installed executables on Windows

See merge request dbus/dbus!136
This commit is contained in:
Simon McVittie 2020-02-19 20:58:16 +00:00
commit a60f4a2ca0
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus/CMakeLists.txt
View file

@ -89,14 +89,18 @@ include_directories(
${EXPAT_INCLUDE_DIR} ${EXPAT_INCLUDE_DIR}
) )
set(DBUS_DAEMON_SOURCES
main.c
)
if(WIN32) if(WIN32)
add_executable_version_info(BUS_SOURCES "dbus-daemon") add_executable_version_info(DBUS_DAEMON_SOURCES "dbus-daemon")
endif() endif()
add_library(dbus-daemon-internal STATIC ${BUS_SOURCES}) add_library(dbus-daemon-internal STATIC ${BUS_SOURCES})
target_link_libraries(dbus-daemon-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES}) target_link_libraries(dbus-daemon-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
add_executable(dbus-daemon main.c) add_executable(dbus-daemon ${DBUS_DAEMON_SOURCES})
target_link_libraries(dbus-daemon dbus-daemon-internal) target_link_libraries(dbus-daemon dbus-daemon-internal)
set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME}) set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})

6
tools/CMakeLists.txt
View file

@ -97,13 +97,17 @@ endif()
install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS})
if(WIN32) if(WIN32)
add_executable_version_info(dbus_launch_SOURCES "dbus-monitor") add_executable_version_info(dbus_monitor_SOURCES "dbus-monitor")
endif() endif()
add_executable(dbus-monitor ${dbus_monitor_SOURCES}) add_executable(dbus-monitor ${dbus_monitor_SOURCES})
target_link_libraries(dbus-monitor ${DBUS_LIBRARIES}) target_link_libraries(dbus-monitor ${DBUS_LIBRARIES})
install(TARGETS dbus-monitor ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS dbus-monitor ${INSTALL_TARGETS_DEFAULT_ARGS})
if(WIN32)
add_executable_version_info(dbus_run_session_SOURCES "dbus-run-session")
endif()
add_executable(dbus-run-session ${dbus_run_session_SOURCES}) add_executable(dbus-run-session ${dbus_run_session_SOURCES})
target_link_libraries(dbus-run-session ${DBUS_INTERNAL_LIBRARIES}) target_link_libraries(dbus-run-session ${DBUS_INTERNAL_LIBRARIES})
install(TARGETS dbus-run-session ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS dbus-run-session ${INSTALL_TARGETS_DEFAULT_ARGS})