090f6dcbfa
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in each and every file anymore [only when subdirs might depend on that].
Also ran a script which makes sure that ${KDE4_INCLUDE_DIR} and ${QT_INCLUDES} are added -last-,
so that installed headers are not preferred over (possibly more uptodate) local headers.
svn path=/trunk/KDE/kdebase/workspace/; revision=521887
The following changes were in SVN, but were removed from git:
M wallpapers/CMakeLists.txt
49 lines
1.4 KiB
CMake
49 lines
1.4 KiB
CMake
kde4_header()
|
|
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
|
|
|
|
|
########### next target ###############
|
|
|
|
set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp )
|
|
|
|
kde4_automoc(${kcm_kwindecoration_PART_SRCS})
|
|
|
|
kde4_add_dcop_skels(kcm_kwindecoration_PART_SRCS kwindecorationIface.h )
|
|
|
|
kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
|
|
|
|
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwindecoration )
|
|
|
|
target_link_libraries(kcm_kwindecoration ${KDE4_KDECORE_LIBS} kdeui kdecorations DCOP ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
|
|
|
|
install_targets(${LIB_INSTALL_DIR}/kde4 kcm_kwindecoration )
|
|
|
|
|
|
########### install files ###############
|
|
|
|
install_files( ${XDG_APPS_DIR} FILES kwindecoration.desktop )
|
|
|
|
kde4_footer()
|
|
|
|
|
|
|
|
#original Makefile.am contents follow:
|
|
|
|
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
|
#
|
|
#kde_module_LTLIBRARIES = kcm_kwindecoration.la
|
|
#
|
|
#kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp
|
|
#noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h
|
|
#
|
|
#kcm_kwindecoration_la_LDFLAGS = \
|
|
# -module -avoid-version $(all_libraries) -no-undefined
|
|
#
|
|
#kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
|
#
|
|
#METASOURCES = AUTO
|
|
#
|
|
#messages:
|
|
# $(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot
|
|
#
|
|
#xdg_apps_DATA = kwindecoration.desktop
|