yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- added HAVE_X11 definition (needed for demo code)

Browse source 
- re-included compilation of demo code
- removed linking against kde4support.
This commit is contained in:
Hugo Pereira Da Costa 2013-08-01 20:20:44 +02:00
parent 8839e86e50
commit 43c4594fac
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/oxygen/CMakeLists.txt
View file

@ -1,9 +1,10 @@
########### add version number into compilation defines ########### add version number into compilation defines
# FIXME: CPACK_PACKAGE_VERSION_* are empty # FIXME: CPACK_PACKAGE_VERSION_* are empty
add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") add_definitions (-DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
add_subdirectory( config ) add_definitions( -DHAVE_X11=${X11_FOUND} )
# add_subdirectory( demo ) add_subdirectory(config)
add_subdirectory( data ) add_subdirectory(demo)
add_subdirectory(data)
include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen) include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
@ -30,7 +31,6 @@ target_link_libraries(
KF5::KWidgets KF5::KWidgets
KF5::KWindowSystem KF5::KWindowSystem
${KDE4_KDEUI_LIBRARY} # KStyle ${KDE4_KDEUI_LIBRARY} # KStyle
${KDE4Support_LIBRARIES} # kdebug
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${Qt5X11Extras_LIBRARIES} ${Qt5X11Extras_LIBRARIES}
${X11_X11_LIB} ${X11_X11_LIB}