"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
dbus-1.13.14.tar.xz and dbus-1.13.16.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.14.tar.xz):CMakeLists.txt  (dbus-1.13.16.tar.xz)
skipping to change at line 24 skipping to change at line 24
endif() endif()
if(CMAKE_MAJOR_VERSION GREATER 2) if(CMAKE_MAJOR_VERSION GREATER 2)
cmake_policy(SET CMP0026 NEW) cmake_policy(SET CMP0026 NEW)
if(CMAKE_MAJOR_VERSION GREATER 4 OR CMAKE_MINOR_VERSION GREATER 1) if(CMAKE_MAJOR_VERSION GREATER 4 OR CMAKE_MINOR_VERSION GREATER 1)
cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0053 NEW)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
endif() endif()
endif() endif()
option(DBUS_BUILD_TESTS "enable unit test code" ON)
# detect version # detect version
include(MacrosAutotools) include(MacrosAutotools)
autoinit(configure.ac) autoinit(configure.ac)
autoversion(dbus) autoversion(dbus)
if(EXISTS ${CMAKE_SOURCE_DIR}/config.h.in) if(EXISTS ${CMAKE_SOURCE_DIR}/config.h.in)
autoheaderchecks(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/cmake/C onfigureChecks.cmake ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake) autoheaderchecks(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/cmake/C onfigureChecks.cmake ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake)
else() else()
message(STATUS "Generate config.h.in with autogen.sh to enable cmake header difference check.") message(STATUS "Generate config.h.in with autogen.sh to enable cmake header difference check.")
endif() endif()
skipping to change at line 228 skipping to change at line 230
endif() endif()
else() else()
set(WARNINGS "sign-compare") set(WARNINGS "sign-compare")
set(WARNINGS_DISABLED "") set(WARNINGS_DISABLED "")
set(WARNINGS_ERRORS "") set(WARNINGS_ERRORS "")
endif() endif()
generate_warning_cflags(WARNINGS_CFLAGS "${WARNINGS}" "${WARNINGS_DISABLED}" "${ WARNINGS_ERRORS}") generate_warning_cflags(WARNINGS_CFLAGS "${WARNINGS}" "${WARNINGS_DISABLED}" "${ WARNINGS_ERRORS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNINGS_CFLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNINGS_CFLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS_CFLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS_CFLAGS}")
# let wine be able to show file and lines in backtrace
if(DBUS_USE_WINE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gstabs")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gstabs")
endif()
if(UNIX AND NOT DBUS_DISABLE_ASSERT) if(UNIX AND NOT DBUS_DISABLE_ASSERT)
# required for backtrace # required for backtrace
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic")
add_definitions(-DDBUS_BUILT_R_DYNAMIC) add_definitions(-DDBUS_BUILT_R_DYNAMIC)
endif() endif()
if(DBUS_WITH_GLIB) if(DBUS_WITH_GLIB)
autodefine(GLIB_VERSION_MIN_REQUIRED) autodefine(GLIB_VERSION_MIN_REQUIRED)
autodefine(GLIB_VERSION_MAX_ALLOWED) autodefine(GLIB_VERSION_MAX_ALLOWED)
skipping to change at line 301 skipping to change at line 309
# linker search directories # linker search directories
link_directories(${DBUS_LIB_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ) link_directories(${DBUS_LIB_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} )
include_directories( ${CMAKE_LIBRARY_PATH} ) include_directories( ${CMAKE_LIBRARY_PATH} )
set(DBUS_INCLUDES) set(DBUS_INCLUDES)
enable_testing() enable_testing()
########### command line options ############### ########### command line options ###############
option(DBUS_BUILD_TESTS "enable unit test code" ON)
if(DBUS_BUILD_TESTS) if(DBUS_BUILD_TESTS)
set(DBUS_ENABLE_EMBEDDED_TESTS ON) set(DBUS_ENABLE_EMBEDDED_TESTS ON)
set(DBUS_ENABLE_MODULAR_TESTS ON) set(DBUS_ENABLE_MODULAR_TESTS ON)
endif() endif()
option(DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF) option(DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF)
if(WIN32) if(WIN32)
# win32 dbus service support - this support is not complete # win32 dbus service support - this support is not complete
option(DBUS_SERVICE "enable dbus service installer" OFF) option(DBUS_SERVICE "enable dbus service installer" OFF)
endif() endif()
skipping to change at line 535 skipping to change at line 541
set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/DBus1) set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/DBus1)
if(WIN32) if(WIN32)
configure_file(cmake/DBus1Config.cmake.in "${CMAKE_BINARY_DIR}/DBus1Config.c make" @ONLY) configure_file(cmake/DBus1Config.cmake.in "${CMAKE_BINARY_DIR}/DBus1Config.c make" @ONLY)
else() else()
configure_file(cmake/DBus1Config.pkgconfig.in "${CMAKE_BINARY_DIR}/DBus1Conf ig.cmake" @ONLY) configure_file(cmake/DBus1Config.pkgconfig.in "${CMAKE_BINARY_DIR}/DBus1Conf ig.cmake" @ONLY)
endif() endif()
configure_file(cmake/DBus1ConfigVersion.cmake.in "${CMAKE_BINARY_DIR}/DBus1Confi gVersion.cmake" @ONLY) configure_file(cmake/DBus1ConfigVersion.cmake.in "${CMAKE_BINARY_DIR}/DBus1Confi gVersion.cmake" @ONLY)
install(FILES install(FILES
"${CMAKE_BINARY_DIR}/DBus1Config.cmake" "${CMAKE_BINARY_DIR}/DBus1Config.cmake"
"${CMAKE_BINARY_DIR}/DBus1ConfigVersion.cmake" "${CMAKE_BINARY_DIR}/DBus1ConfigVersion.cmake"
DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev DESTINATION "${INSTALL_CMAKE_DIR}"
) )
if(WIN32) if(WIN32)
install(EXPORT DBus1Targets DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev ) install(EXPORT DBus1Targets DESTINATION "${INSTALL_CMAKE_DIR}")
endif() endif()
########### subdirs ############### ########### subdirs ###############
add_subdirectory( dbus ) add_subdirectory( dbus )
add_subdirectory( bus ) add_subdirectory( bus )
if(DBUS_BUILD_TESTS) if(DBUS_BUILD_TESTS)
add_subdirectory( test ) add_subdirectory( test )
add_custom_target(check add_custom_target(check
COMMAND ctest -R ^test-.* COMMAND ctest -R ^test-.*
skipping to change at line 603 skipping to change at line 609
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 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 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} " )
message(" System bus PID file: ${DBUS_SYSTEM_PID_FILE} " ) message(" System bus PID file: ${DBUS_SYSTEM_PID_FILE} " )
message(" System bus user: ${DBUS_USER} " ) message(" System bus user: ${DBUS_USER} " )
 End of changes. 6 change blocks. 
4 lines changed or deleted 11 lines changed or added

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