Commit 7cda0ff0 authored by Romain Pokrzywka's avatar Romain Pokrzywka Committed by Ralf Habacker

fixed the TODO, the if block didn't make sense indeed. Also make it clearer...

fixed the TODO, the if block didn't make sense indeed. Also make it clearer which dirs in the summary are installation dirs
parent 5bf0e864
......@@ -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} ")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment