From 43c4594facd5146c6a8c666b3ed5e6f3fef946ad Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Thu, 1 Aug 2013 20:20:44 +0200 Subject: [PATCH] - added HAVE_X11 definition (needed for demo code) - re-included compilation of demo code - removed linking against kde4support. --- clients/oxygen/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index f57d46934b..34a21c6fcd 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,9 +1,10 @@ ########### add version number into compilation defines # FIXME: CPACK_PACKAGE_VERSION_* are empty -add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") -add_subdirectory( config ) -# add_subdirectory( demo ) -add_subdirectory( data ) +add_definitions (-DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") +add_definitions( -DHAVE_X11=${X11_FOUND} ) +add_subdirectory(config) +add_subdirectory(demo) +add_subdirectory(data) include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen) @@ -30,7 +31,6 @@ target_link_libraries( KF5::KWidgets KF5::KWindowSystem ${KDE4_KDEUI_LIBRARY} # KStyle - ${KDE4Support_LIBRARIES} # kdebug ${Qt5Widgets_LIBRARIES} ${Qt5X11Extras_LIBRARIES} ${X11_X11_LIB}