diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f9f570..db35ee9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,8 @@ IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8") ENDIF() SET( CMAKE_CXX_FLAGS "" ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) + ###################################################################################### # Configure targets ###################################################################################### @@ -168,9 +170,6 @@ SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" ) ADD_FEATURE_INFO(PlaYUVerApp BUILD_APP "Build Graphical Interface") ADD_FEATURE_INFO(PlaYUVerTools BUILD_TOOLS "Build Command line tool" ) -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) -CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) - ADD_SUBDIRECTORY( lib ) ADD_SUBDIRECTORY( modules ) @@ -187,6 +186,8 @@ IF( ${BUILD_EXAMPLES} ) ENDIF() +CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) + ###################################################################################### # Final information dump ###################################################################################### diff --git a/app/AboutDialog.cpp b/app/AboutDialog.cpp index 5871761..a4b61f5 100644 --- a/app/AboutDialog.cpp +++ b/app/AboutDialog.cpp @@ -24,7 +24,7 @@ * in KTikZ project */ -#include +#include "config.h" #include "AboutDialog.h" #include diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 82e3e49..d182660 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -31,7 +31,8 @@ ELSE() LIST(APPEND QT_MODULES Core Gui Widgets PrintSupport Concurrent ) IF( USE_QTDBUS ) - FIND_PACKAGE( Qt5DBus ) + FIND_PACKAGE( Qt5DBus ) + SET_PACKAGE_PROPERTIES(Qt5DBus PROPERTIES DESCRIPTION "Support for Qt5 DBus messages between instances" TYPE OPTIONAL ) IF( ${Qt5DBus_FOUND} ) SET( USE_QTDBUS ${Qt5DBus_FOUND} ) # TODO: fix this stupid variable SET( USE_QTDBUS ${Qt5DBus_FOUND} PARENT_SCOPE)