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
44 lines
1,020 B
CMake
44 lines
1,020 B
CMake
kde4_header()
|
|
|
|
add_subdirectory( config )
|
|
|
|
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
|
|
|
########### next target ###############
|
|
|
|
set(kwin3_default_PART_SRCS kdedefault.cpp )
|
|
|
|
kde4_automoc(${kwin3_default_PART_SRCS})
|
|
|
|
kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS})
|
|
|
|
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_default )
|
|
|
|
target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} kdefx kdecorations ${QT_QTGUI_LIBRARY})
|
|
|
|
install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_default )
|
|
|
|
|
|
########### install files ###############
|
|
|
|
|
|
kde4_footer()
|
|
|
|
|
|
|
|
#original Makefile.am contents follow:
|
|
|
|
#
|
|
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
|
#
|
|
#SUBDIRS = . config
|
|
#
|
|
#kde_module_LTLIBRARIES = kwin3_default.la
|
|
#
|
|
#kwin3_default_la_SOURCES = kdedefault.cpp
|
|
#kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
|
#kwin3_default_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la
|
|
#
|
|
#METASOURCES = AUTO
|
|
#noinst_HEADERS = kdedefault.h
|
|
#
|