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
45 lines
1 KiB
CMake
45 lines
1 KiB
CMake
kde4_header()
|
|
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
|
|
|
|
|
########### next target ###############
|
|
|
|
set(kwin_quartz_config_PART_SRCS config.cpp )
|
|
|
|
kde4_automoc(${kwin_quartz_config_PART_SRCS})
|
|
|
|
kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
|
|
|
|
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_quartz_config )
|
|
|
|
target_link_libraries(kwin_quartz_config ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY})
|
|
|
|
install_targets(${LIB_INSTALL_DIR}/kde4 kwin_quartz_config )
|
|
|
|
|
|
########### install files ###############
|
|
|
|
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES )
|
|
|
|
kde4_footer()
|
|
|
|
|
|
|
|
#original Makefile.am contents follow:
|
|
|
|
#INCLUDES = $(all_includes)
|
|
#
|
|
#kde_module_LTLIBRARIES = kwin_quartz_config.la
|
|
#
|
|
#kwin_quartz_config_la_SOURCES = config.cpp
|
|
#kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
|
#kwin_quartz_config_la_LIBADD = $(LIB_KDEUI)
|
|
#
|
|
#METASOURCES = AUTO
|
|
#noinst_HEADERS = config.h
|
|
#
|
|
#lnkdir = $(kde_datadir)/kwin/
|
|
#
|
|
####KMAKE-start (don't edit or delete this block)
|
|
#
|
|
####KMAKE-end
|