"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "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 55 skipping to change at line 55
"https://gitlab.freedesktop.org/dbus/dbus/issues" "https://gitlab.freedesktop.org/dbus/dbus/issues"
) )
include(Macros) include(Macros)
string(TIMESTAMP DBUS_BUILD_TIMESTAMP "%Y%m%d%H%M" UTC) string(TIMESTAMP DBUS_BUILD_TIMESTAMP "%Y%m%d%H%M" UTC)
set(BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_V ERSION},${DBUS_PATCH_VERSION}) set(BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_V ERSION},${DBUS_PATCH_VERSION})
set(BUILD_TIMESTAMP ${DBUS_BUILD_TIMESTAMP}) set(BUILD_TIMESTAMP ${DBUS_BUILD_TIMESTAMP})
########### basic vars ############### ########### basic vars ###############
if(UNIX AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(DBUS_LINUX 1)
endif()
include(GNUInstallDirs) include(GNUInstallDirs)
if(DBUSDIR) if(DBUSDIR)
set(DBUS_INSTALL_DIR "${DBUSDIR}") set(DBUS_INSTALL_DIR "${DBUSDIR}")
endif() endif()
if($ENV{DBUSDIR}) if($ENV{DBUSDIR})
set(DBUS_INSTALL_DIR "$ENV{DBUSDIR}") set(DBUS_INSTALL_DIR "$ENV{DBUSDIR}")
endif() endif()
if(DBUS_INSTALL_DIR) if(DBUS_INSTALL_DIR)
skipping to change at line 138 skipping to change at line 142
if(NOT WIN32) if(NOT WIN32)
set(CMAKE_THREAD_PREFER_PTHREAD ON) set(CMAKE_THREAD_PREFER_PTHREAD ON)
include(FindThreads) include(FindThreads)
endif() endif()
option(DBUS_DISABLE_ASSERT "Disable assertion checking" OFF) option(DBUS_DISABLE_ASSERT "Disable assertion checking" OFF)
option(DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF) option(DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
option(DBUS_ENABLE_CONTAINERS "enable restricted servers for app-containers" OFF ) option(DBUS_ENABLE_CONTAINERS "enable restricted servers for app-containers" OFF )
if(DBUS_LINUX)
add_auto_option(ENABLE_SYSTEMD "build with systemd at_console support" AUTO)
include(FindPkgConfig)
pkg_check_modules(SYSTEMD libsystemd>=209)
if(NOT SYSTEMD_FOUND)
pkg_check_modules(SYSTEMD libsystemd-login>=32 libsystemd-daemon>=32 lib
systemd-journal>=32)
endif()
check_auto_option(ENABLE_SYSTEMD "systemd support" SYSTEMD_FOUND "systemd")
if(ENABLE_SYSTEMD AND SYSTEMD_FOUND)
set(DBUS_BUS_ENABLE_SYSTEMD ON)
set(HAVE_SYSTEMD ${SYSTEMD_FOUND})
endif()
option(ENABLE_USER_SESSION "enable user-session semantics for session bus un
der systemd" OFF)
set(DBUS_ENABLE_USER_SESSION ${ENABLE_USER_SESSION})
add_path_option(WITH_SYSTEMD_SYSTEMUNITDIR "Directory for systemd service fi
les" "")
add_path_option(WITH_SYSTEMD_USERUNITDIR "Directory for systemd user service
files" "")
# get defaults
pkg_check_modules(_SYSTEMD systemd)
if(_SYSTEMD_FOUND)
pkg_get_variable(_SYSTEMD_PREFIX systemd prefix)
pkg_get_variable(_SYSTEMD_SYSTEMUNITDIR systemd systemdsystemunitdir)
pkg_get_variable(_SYSTEMD_USERUNITDIR systemd systemduserunitdir)
# remove install prefix, which may not match the current prefix
string(REPLACE "${_SYSTEMD_PREFIX}/" "" DBUS_SYSTEMD_SYSTEMUNITDIR ${_SY
STEMD_SYSTEMUNITDIR})
string(REPLACE "${_SYSTEMD_PREFIX}/" "" DBUS_SYSTEMD_USERUNITDIR ${_SYST
EMD_USERUNITDIR})
else()
set(DBUS_SYSTEMD_SYSTEMUNITDIR lib/systemd/system)
set(DBUS_SYSTEMD_USERUNITDIR lib/systemd/user)
endif()
if(WITH_SYSTEMD_SYSTEMUNITDIR)
set(DBUS_SYSTEMD_SYSTEMUNITDIR ${WITH_SYSTEMD_SYSTEMUNITDIR})
endif()
if(WITH_SYSTEMD_USERUNITDIR)
set(DBUS_SYSTEMD_USERUNITDIR ${WITH_SYSTEMD_USERUNITDIR})
endif()
endif()
if(WIN32) if(WIN32)
set(FD_SETSIZE "8192" CACHE STRING "The maximum number of connections that c an be handled at once") set(FD_SETSIZE "8192" CACHE STRING "The maximum number of connections that c an be handled at once")
endif() endif()
find_package(EXPAT) find_package(EXPAT)
find_package(X11) find_package(X11)
find_package(GLib2) find_package(GLib2)
if(GLIB2_FOUND) if(GLIB2_FOUND)
option(DBUS_WITH_GLIB "build with glib" ON) option(DBUS_WITH_GLIB "build with glib" ON)
endif() endif()
skipping to change at line 608 skipping to change at line 650
endif() endif()
message(" Building unit tests: ${DBUS_BUILD_TESTS} " ) message(" Building unit tests: ${DBUS_BUILD_TESTS} " )
message(" Building with GLib: ${DBUS_WITH_GLIB} " ) message(" Building with GLib: ${DBUS_WITH_GLIB} " )
message(" Building verbose mode: ${DBUS_ENABLE_VERBOSE_MODE} " ) message(" Building verbose mode: ${DBUS_ENABLE_VERBOSE_MODE} " )
message(" Building w/o assertions: ${DBUS_DISABLE_ASSERT} " ) message(" Building w/o assertions: ${DBUS_DISABLE_ASSERT} " )
message(" Building w/o checks: ${DBUS_DISABLE_CHECKS} " ) message(" Building w/o checks: ${DBUS_DISABLE_CHECKS} " )
message(" Building bus stats API: ${DBUS_ENABLE_STATS} " ) message(" Building bus stats API: ${DBUS_ENABLE_STATS} " )
message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} " ) message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} " )
message(" Building inotify support: ${DBUS_BUS_ENABLE_INOTIFY} " ) message(" Building inotify support: ${DBUS_BUS_ENABLE_INOTIFY} " )
message(" Building kqueue support: ${DBUS_BUS_ENABLE_KQUEUE} " ) message(" Building kqueue support: ${DBUS_BUS_ENABLE_KQUEUE} " )
message(" Building systemd support: ${DBUS_BUS_ENABLE_SYSTEMD} "
)
message(" systemd system install dir:${DBUS_SYSTEMD_SYSTEMUNITDIR} "
)
message(" systemd user install dir: ${DBUS_SYSTEMD_USERUNITDIR} "
)
message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} " ) message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} " )
message(" Building Qt help docs: ${DBUS_ENABLE_QTHELP_DOCS} " ) message(" Building Qt help docs: ${DBUS_ENABLE_QTHELP_DOCS} " )
message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} " ) message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} " )
message(" Daemon executable name: ${DBUS_DAEMON_NAME}") message(" Daemon executable name: ${DBUS_DAEMON_NAME}")
if(WIN32) if(WIN32)
message(" Session bus listens on: ${DBUS_SESSION_BUS_LISTEN_ADDRESS} " ) message(" Session bus listens on: ${DBUS_SESSION_BUS_LISTEN_ADDRESS} " )
message(" Session clients connect to: ${DBUS_SESSION_BUS_CONNECT_ADDRESS} ") message(" Session clients connect to: ${DBUS_SESSION_BUS_CONNECT_ADDRESS} ")
else() else()
message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} " ) message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} " )
message(" System bus socket: ${DBUS_SYSTEM_SOCKET} " ) message(" System bus socket: ${DBUS_SYSTEM_SOCKET} " )
skipping to change at line 678 skipping to change at line 723
add_custom_target(help-options add_custom_target(help-options
cmake -LH cmake -LH
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
# #
# create pkgconfig file # create pkgconfig file
# #
if(DBUS_ENABLE_PKGCONFIG) if(DBUS_ENABLE_PKGCONFIG)
set(PLATFORM_LIBS pthread ${LIBRT}) set(PLATFORM_LIBS pthread ${LIBRT})
include(FindPkgConfig QUIET)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
# convert lists of link libraries into -lstdc++ -lm etc.. # convert lists of link libraries into -lstdc++ -lm etc..
foreach(LIB ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) foreach(LIB ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
set(LIBDBUS_LIBS "${LIBDBUS_LIBS} -l${LIB}") set(LIBDBUS_LIBS "${LIBDBUS_LIBS} -l${LIB}")
endforeach() endforeach()
set(original_prefix "${CMAKE_INSTALL_PREFIX}") set(original_prefix "${CMAKE_INSTALL_PREFIX}")
if(DBUS_RELOCATABLE) if(DBUS_RELOCATABLE)
set(pkgconfig_prefix "\${pcfiledir}/../..") set(pkgconfig_prefix "\${pcfiledir}/../..")
else() else()
set(pkgconfig_prefix "\${original_prefix}") set(pkgconfig_prefix "\${original_prefix}")
 End of changes. 4 change blocks. 
1 lines changed or deleted 54 lines changed or added

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