"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "bus/CMakeLists.txt" between
dbus-1.13.16.tar.xz and dbus-1.13.18.tar.xz

About: D-Bus is an inter-process communication (IPC) system, allowing multiple, concurrently-running applications to communicate with one another. D-Bus supplies both a system daemon and a per-user-login-session daemon. Development version.

CMakeLists.txt  (dbus-1.13.16.tar.xz):CMakeLists.txt  (dbus-1.13.18.tar.xz)
skipping to change at line 109 skipping to change at line 109
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_LI BRARIES}) target_link_libraries(dbus-daemon-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LI BRARIES})
add_executable(dbus-daemon ${DBUS_DAEMON_SOURCES}) 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_CLIEN T_DEFINITIONS}) set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIEN T_DEFINITIONS})
install(TARGETS dbus-daemon ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS dbus-daemon ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION ${CMAKE_INSTA LL_DATADIR}/dbus-1) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION ${CMAKE_INSTA LL_DATADIR}/dbus-1)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/session.d) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/session.d)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
if(NOT WIN32) if(NOT WIN32)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/system.conf DESTINATION ${CMAKE_IN STALL_DATADIR}/dbus-1) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/system.conf DESTINATION ${CMAKE_IN STALL_DATADIR}/dbus-1)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf DESTINAT ION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf DESTINAT ION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-service s) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-service s)
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/run/dbus) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/dbus)
endif() endif()
if(DBUS_SERVICE) if(DBUS_SERVICE)
set(dbus_service_SOURCES set(dbus_service_SOURCES
bus-service-win.c bus-service-win.c
# TODO: add additional files # TODO: add additional files
# service-main.c # service-main.c
# ${BUS_SOURCES} # ${BUS_SOURCES}
) )
skipping to change at line 156 skipping to change at line 156
target_link_libraries(launch-helper-internal ${DBUS_INTERNAL_LIBRARIES} ${EX PAT_LIBRARIES}) target_link_libraries(launch-helper-internal ${DBUS_INTERNAL_LIBRARIES} ${EX PAT_LIBRARIES})
add_executable(dbus-daemon-launch-helper activation-helper.c activation-help er-bin.c ) add_executable(dbus-daemon-launch-helper activation-helper.c activation-help er-bin.c )
target_link_libraries(dbus-daemon-launch-helper launch-helper-internal) target_link_libraries(dbus-daemon-launch-helper launch-helper-internal)
endif() endif()
if(MSVC) if(MSVC)
project_source_group(${GROUP_CODE} bus_test_SOURCES dummy) project_source_group(${GROUP_CODE} bus_test_SOURCES dummy)
endif() endif()
configure_file(example-session-disable-stats.conf.in ${CMAKE_CURRENT_BINARY_DIR} macro(install_example_in_file a)
/example-session-disable-stats.conf) configure_file(${a}.in ${CMAKE_CURRENT_BINARY_DIR}/${a})
set(EXAMPLES_DATA install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${a} DESTINATION ${CMAKE_INSTALL_D
${CMAKE_CURRENT_BINARY_DIR}/example-session-disable-stats.conf ATADIR}/doc/dbus/examples)
) endmacro()
macro(install_example_file a)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${a} DESTINATION ${CMAKE_INSTALL_D
ATADIR}/doc/dbus/examples)
endmacro()
install_example_in_file(example-session-disable-stats.conf)
if(NOT WIN32) if(NOT WIN32)
configure_file(example-system-enable-stats.conf.in ${CMAKE_CURRENT_BINARY_DI install_example_in_file(example-system-enable-stats.conf)
R}/example-system-enable-stats.conf) install_example_file(example-system-hardening-without-traditional-activation
list(APPEND EXAMPLES_DATA .conf)
${CMAKE_CURRENT_BINARY_DIR}/example-system-enable-stats.conf
)
endif() endif()
install(FILES ${EXAMPLES_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/exa if(DBUS_BUS_ENABLE_SYSTEMD)
mples) configure_file(dbus.socket.in ${CMAKE_CURRENT_BINARY_DIR}/dbus.socket)
configure_file(dbus.service.in ${CMAKE_CURRENT_BINARY_DIR}/dbus.service)
add_systemd_service(${CMAKE_CURRENT_BINARY_DIR}/dbus.socket PATH ${DBUS_SYST
EMD_SYSTEMUNITDIR} LINKS sockets.target.wants)
add_systemd_service(${CMAKE_CURRENT_BINARY_DIR}/dbus.service PATH ${DBUS_SYS
TEMD_SYSTEMUNITDIR} LINKS multi-user.target.wants)
endif()
if(DBUS_ENABLE_USER_SESSION)
configure_file(systemd-user/dbus.socket.in ${CMAKE_CURRENT_BINARY_DIR}/syste
md-user/dbus.socket)
configure_file(systemd-user/dbus.service.in ${CMAKE_CURRENT_BINARY_DIR}/syst
emd-user/dbus.service)
add_systemd_service(${CMAKE_CURRENT_BINARY_DIR}/systemd-user/dbus.socket PAT
H ${DBUS_SYSTEMD_USERUNITDIR} LINKS sockets.target.wants)
add_systemd_service(${CMAKE_CURRENT_BINARY_DIR}/systemd-user/dbus.service PA
TH ${DBUS_SYSTEMD_USERUNITDIR})
endif()
## mop up the gcov files ## mop up the gcov files
#clean-local: #clean-local:
# /bin/rm *.bb *.bbg *.da *.gcov || true # /bin/rm *.bb *.bbg *.da *.gcov || true
#install-data-hook: #install-data-hook:
# $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus # $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
# $(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d # $(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d
# $(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services # $(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services
 End of changes. 6 change blocks. 
15 lines changed or deleted 37 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)