diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 69 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 10 |
2 files changed, 46 insertions, 33 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 13cdb741..0a3652a8 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,8 +1,12 @@ project(dbus) -set (DBUS_MAJOR_VERSION "1") -set (DBUS_MINOR_VERSION "4") -set (DBUS_MICRO_VERSION "3") +######################################################################### +# detect version +######################################################################### +file (READ ../configure.ac configure_ac) +string (REGEX REPLACE ".*dbus_major_version], .([0-9]+).*" "\\1" DBUS_MAJOR_VERSION ${configure_ac}) +string (REGEX REPLACE ".*dbus_minor_version], .([0-9]+).*" "\\1" DBUS_MINOR_VERSION ${configure_ac}) +string (REGEX REPLACE ".*dbus_micro_version], .([0-9]+).*" "\\1" DBUS_MICRO_VERSION ${configure_ac}) # used by file version info set (DBUS_PATCH_VERSION "0") set (DBUS_VERSION ${DBUS_MAJOR_VERSION}.${DBUS_MINOR_VERSION}.${DBUS_MICRO_VERSION}) @@ -34,7 +38,7 @@ if ($ENV{DBUSDIR}) endif ($ENV{DBUSDIR}) if (DBUS_INSTALL_DIR) - set(CMAKE_INSTALL_PREFIX "${DBUS_INSTALL_DIR}" CACHE TYPE PATH FORCE) + set(CMAKE_INSTALL_PREFIX "${DBUS_INSTALL_DIR}" CACHE PATH FORCE) else (DBUS_INSTALL_DIR) set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") endif (DBUS_INSTALL_DIR) @@ -88,11 +92,11 @@ find_package(LibExpat) find_package(X11) if(NOT WIN32) - OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON) + option (DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON) endif(NOT WIN32) #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE) -OPTION(DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF) +option (DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF) # do config checks INCLUDE(ConfigureChecks.cmake) @@ -104,7 +108,7 @@ SET(DBUS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/..) include (MacroLibrary) if(VCS) - set(DBUS_VERBOSE_C_S 1 CACHE TYPE STRING FORCE) + set(DBUS_VERBOSE_C_S 1 CACHE STRING FORCE) set(DBUS_VERBOSE_C_S 1) endif(VCS) @@ -122,8 +126,8 @@ if(WIN32) # Use the highest warning level if (WALL) - set(WALL 1 CACHE TYPE STRING FORCE) - set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE) + set(WALL 1 CACHE STRING FORCE) + set(CMAKE_CXX_WARNING_LEVEL 4 CACHE STRING FORCE) if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -137,7 +141,7 @@ if(WIN32) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") endif(CMAKE_C_FLAGS MATCHES "/W[0-4]") else (WALL) - set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE) + set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING FORCE) endif (WALL) SET(MSVC_W_ERROR " /we4028 /we4013 /we4133 /we4047 /we4031 /we4002 /we4003 /we4114") @@ -219,24 +223,24 @@ ENABLE_TESTING() # TODO: take check from configure.in #AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE) -OPTION(DBUS_BUILD_TESTS "enable unit test code" ON) +option (DBUS_BUILD_TESTS "enable unit test code" ON) if(DBUS_BUILD_TESTS) add_definitions(-DDBUS_BUILD_TESTS) endif(DBUS_BUILD_TESTS) -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(DBUS_USE_OUTPUT_DEBUG_STRING) add_definitions(-DDBUS_USE_OUTPUT_DEBUG_STRING) endif(DBUS_USE_OUTPUT_DEBUG_STRING) if(WIN32) # 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(WIN32) #AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) -OPTION(DBUS_ENABLE_ANSI "enable -ansi -pedantic gcc flags" OFF) +option (DBUS_ENABLE_ANSI "enable -ansi -pedantic gcc flags" OFF) if(DBUS_ENABLE_ANSI) if(NOT MSVC) add_definitions(-ansi -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -pedantic) @@ -246,14 +250,14 @@ if(DBUS_ENABLE_ANSI) endif(DBUS_ENABLE_ANSI) #AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) -OPTION(DBUS_ENABLE_VERBOSE_MODE "support verbose debug mode" ON) +option (DBUS_ENABLE_VERBOSE_MODE "support verbose debug mode" ON) #AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes) -OPTION(DBUS_DISABLE_CHECKS "Disable public API sanity checking" OFF) +option (DBUS_DISABLE_CHECKS "Disable public API sanity checking" OFF) if(NOT MSVC) #AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no) - OPTION(DBUS_GCOV_ENABLED "compile with coverage profiling instrumentation (gcc only)" OFF) + option (DBUS_GCOV_ENABLED "compile with coverage profiling instrumentation (gcc only)" OFF) if(DBUS_GCOV_ENABLED) add_definitions(-fprofile-arcs -ftest-coverage) # FIXME!!!! @@ -270,7 +274,7 @@ endif(NOT MSVC) #AC_ARG_ENABLE(dnotify, AS_HELP_STRING([--enable-dnotify],[build with dnotify support (linux only)]),enable_dnotify=$enableval,enable_dnotify=auto) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - OPTION(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX "build with dnotify support (linux only)" ON) # add a check ! + option (DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX "build with dnotify support (linux only)" ON) # add a check ! endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") #AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support (FreeBSD only)]),enable_kqueue=$enableval,enable_kqueue=auto) @@ -279,9 +283,9 @@ endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") #AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) STRING(TOUPPER ${CMAKE_SYSTEM_NAME} sysname) if("${sysname}" MATCHES ".*SOLARIS.*") - OPTION(HAVE_CONSOLE_OWNER_FILE "enable console owner file (solaris only)" ON) + option (HAVE_CONSOLE_OWNER_FILE "enable console owner file (solaris only)" ON) if(HAVE_CONSOLE_OWNER_FILE) - SET(DBUS_CONSOLE_OWNER_FILE "/dev/console" CACHE STRING "Directory to check for console ownerhip") + option (DBUS_CONSOLE_OWNER_FILE "Directory to check for console ownerhip" "/dev/console") endif(HAVE_CONSOLE_OWNER_FILE) endif("${sysname}" MATCHES ".*SOLARIS.*") @@ -291,9 +295,9 @@ if(NOT LIBXML2_FOUND AND NOT LIBEXPAT_FOUND) endif(NOT LIBXML2_FOUND AND NOT LIBEXPAT_FOUND) if(LIBEXPAT_FOUND) - OPTION(DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON) + option (DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON) else(LIBEXPAT_FOUND) - OPTION(DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" OFF) + option (DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" OFF) endif(LIBEXPAT_FOUND) if(DBUS_USE_EXPAT) @@ -341,11 +345,11 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI) endif(UNAME_EXECUTABLE) endif(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI) -OPTION(DBUS_HAVE_ATOMIC_INT "Some atomic integer implementation present" ${atomic_int}) -OPTION(DBUS_USE_ATOMIC_INT_486 "Use atomic integer implementation for 486" ${atomic_int_486}) +option (DBUS_HAVE_ATOMIC_INT "Some atomic integer implementation present" ${atomic_int}) +option (DBUS_USE_ATOMIC_INT_486 "Use atomic integer implementation for 486" ${atomic_int_486}) if(X11_FOUND) - OPTION(DBUS_BUILD_X11 "Build with X11 autolaunch support " ON) + option (DBUS_BUILD_X11 "Build with X11 autolaunch support " ON) endif(X11_FOUND) # test binary names @@ -435,16 +439,16 @@ set (DBUS_USER ) if (WIN32) - set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address" ) - set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address" ) + set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "system bus default address" FORCE) + set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "nonce-tcp:" CACHE STRING "session bus default address" FORCE) set (DBUS_SYSTEM_CONFIG_FILE "etc/dbus-1/system.conf") set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf") # bus-test expects a non empty string set (DBUS_USER "Administrator") else (WIN32) - set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:tmpdir=" CACHE STRING "system bus default address" ) - set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "unix:path=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default address" ) + option (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "system bus default address" "unix:tmpdir=") + option (DBUS_SESSION_BUS_DEFAULT_ADDRESS "session bus default address" "unix:path=${DBUS_SESSION_SOCKET_DIR}") set (sysconfdir "") set (configdir ${sysconfdir}/dbus-1 ) set (DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf) @@ -452,7 +456,7 @@ else (WIN32) set (DBUS_USER "root") endif (WIN32) -set(DBUS_DAEMON_NAME dbus-daemon CACHE STRING "The name of the dbus daemon executable") +set (DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable" FORCE) ########### create config.h ############### @@ -607,3 +611,8 @@ endif(DBUS_DISABLE_CHECKS) MESSAGE(" ") INCLUDE(modules/CPackInstallConfig.cmake) + +add_custom_target(help-options + cmake -LH + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 295e0284..5220a8d5 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -83,6 +83,11 @@ #endif #cmakedefine DBUS_BUILD_X11 1 +/* For the moment, the cmake build system doesn't have an equivalent of + * the autoconf build system's --disable-x11-autolaunch */ +#ifdef DBUS_BUILD_X11 +# define DBUS_ENABLE_X11_AUTOLAUNCH 1 +#endif #define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; } @@ -247,9 +252,8 @@ #define _dbus_verbose_C_S _dbus_verbose #endif -#ifdef _MSC_VER -/* avoid defines of ELEMENT_TYPE */ -#define _WINIOCTL_ +# if defined(_MSC_VER) && !defined(inline) +#define inline __inline #endif #endif // _DBUS_CONFIG_H |