From 7cda0ff0305c1112f858149acf8a37caa6317586 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 2 Feb 2010 15:24:48 -0800 Subject: [PATCH] fixed the TODO, the if block didn't make sense indeed. Also make it clearer which dirs in the summary are installation dirs --- cmake/CMakeLists.txt | 49 ++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 425f64893..8e8f8e4b6 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -212,30 +212,16 @@ else (DBUS_INSTALL_DIR) set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") endif (DBUS_INSTALL_DIR) -# TODO: setting EXPANDED_... has nothing to do with DBUS_INSTALL_SYSTEM_LIBS -if (DBUS_INSTALL_SYSTEM_LIBS) - set(prefix ${DBUS_INSTALL_DIR}) - set(exec_prefix ${prefix}) - set(EXPANDED_LIBDIR ${DBUS_INSTALL_DIR}/lib) - set(EXPANDED_INCLUDEDIR ${DBUS_INSTALL_DIR}/include) - set(EXPANDED_BINDIR ${DBUS_INSTALL_DIR}/bin) - set(EXPANDED_SYSCONFDIR ${DBUS_INSTALL_DIR}/etc) - set(EXPANDED_DATADIR ${DBUS_INSTALL_DIR}/data) - set(DBUS_BINDIR ${EXPANDED_BINDIR}) - set(DBUS_MACHINE_UUID_FILE ${DBUS_INSTALL_DIR}/lib/dbus/machine-id) -else (DBUS_INSTALL_SYSTEM_LIBS) - set(EXPANDED_INCLUDEDIR ${CMAKE_SOURCE_DIR}/include) - set(EXPANDED_DATADIR ${CMAKE_BINARY_DIR}/test/data) - if (MSVC_IDE) - set(EXPANDED_BINDIR ${CMAKE_BINARY_DIR}/bin/debug) - else (MSVC_IDE) - set(EXPANDED_BINDIR ${CMAKE_BINARY_DIR}/bin) - endif (MSVC_IDE) - set(DBUS_BINDIR ${EXPANDED_BINDIR}) - set(DBUS_MACHINE_UUID_FILE ${CMAKE_BINARY_DIR}/lib/dbus/machine-id) -endif (DBUS_INSTALL_SYSTEM_LIBS) - -set (DBUS_DAEMONDIR ${EXPANDED_BINDIR}) +set(prefix ${DBUS_INSTALL_DIR}) +set(exec_prefix ${prefix}) +set(EXPANDED_LIBDIR ${DBUS_INSTALL_DIR}/lib) +set(EXPANDED_INCLUDEDIR ${DBUS_INSTALL_DIR}/include) +set(EXPANDED_BINDIR ${DBUS_INSTALL_DIR}/bin) +set(EXPANDED_SYSCONFDIR ${DBUS_INSTALL_DIR}/etc) +set(EXPANDED_DATADIR ${DBUS_INSTALL_DIR}/data) +set(DBUS_MACHINE_UUID_FILE ${DBUS_INSTALL_DIR}/lib/dbus/machine-id) +set(DBUS_BINDIR ${EXPANDED_BINDIR}) +set(DBUS_DAEMONDIR ${EXPANDED_BINDIR}) ########### command line options ############### # TODO: take check from configure.in @@ -533,14 +519,15 @@ GET_FILENAME_COMPONENT(CXX_COMPILER ${CMAKE_CXX_COMPILER} NAME) message(" D-BUS ${DBUS_VERSION} ") message(" =========== ") message(" ") -message(" prefix: ${prefix} ") -message(" exec_prefix: ${exec_prefix} ") -message(" libdir: ${EXPANDED_LIBDIR} ") -message(" bindir: ${EXPANDED_BINDIR} ") -message(" sysconfdir: ${EXPANDED_SYSCONFDIR} ") -message(" localstatedir: ${EXPANDED_LOCALSTATEDIR} ") -message(" datadir: ${EXPANDED_DATADIR} ") +message(" install prefix: ${prefix} ") +message(" install exec_prefix: ${exec_prefix} ") +message(" install libdir: ${EXPANDED_LIBDIR} ") +message(" install bindir: ${EXPANDED_BINDIR} ") +message(" install sysconfdir: ${EXPANDED_SYSCONFDIR} ") +#message(" install localstatedir: ${EXPANDED_LOCALSTATEDIR} ") +message(" install datadir: ${EXPANDED_DATADIR} ") message(" source code location: ${DBUS_SOURCE_DIR} ") +message(" build dir: ${CMAKE_BINARY_DIR} ") message(" c compiler: ${C_COMPILER} ") message(" cflags: ${CMAKE_C_FLAGS} ") message(" cflags debug: ${CMAKE_C_FLAGS_DEBUG} ") -- 2.47.3