generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-10-31 12:01:45 +02:00
parent f6d493c99d
commit d2a5236cd7
19 changed files with 528 additions and 411 deletions

View file

@ -1,8 +1,6 @@
project(libkcddb)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDES}
${KDE4_INCLUDES}
${KDE4_KDECORE_INCLUDES}
@ -21,9 +19,10 @@ if(MUSICBRAINZ5_FOUND)
set(HAVE_MUSICBRAINZ5 1)
include_directories(${MUSICBRAINZ5_INCLUDE_DIRS})
set(libmusicbrainz_SRCS ${libmusicbrainz_SRCS}
set(libmusicbrainz_SRCS
musicbrainz/musicbrainzlookup.cpp
musicbrainz/asyncmusicbrainzlookup.cpp)
musicbrainz/asyncmusicbrainzlookup.cpp
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
else(MUSICBRAINZ5_FOUND)

View file

@ -1,22 +1,29 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../libkcddb
${CMAKE_CURRENT_BINARY_DIR}/../libkcddb
)
########### next target ###############
set(kcm_cddb_PART_SRCS cddbconfigwidget.cpp kcmcddb.cpp cddbconfigwidget.ui)
set(kcm_cddb_PART_SRCS
cddbconfigwidget.cpp
kcmcddb.cpp
cddbconfigwidget.ui
)
kde4_add_plugin(kcm_cddb ${kcm_cddb_PART_SRCS})
target_link_libraries(kcm_cddb ${KDE4_KIO_LIBS} kcddb)
target_link_libraries(kcm_cddb
${KDE4_KIO_LIBS}
kcddb
)
install(TARGETS kcm_cddb DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install( FILES libkcddb.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(
TARGETS kcm_cddb
DESTINATION ${PLUGIN_INSTALL_DIR}
)
install(
FILES libkcddb.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)

View file

@ -1,8 +1,3 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
########### next target ###############
set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
@ -51,7 +46,8 @@ set_target_properties(kcddb PROPERTIES
########### install files ###############
install(FILES
install(
FILES
cdinfo.h
cdinfodialog.h
client.h
@ -60,7 +56,17 @@ install(FILES
kcddb.h
kcddb_export.h
${CMAKE_CURRENT_BINARY_DIR}/configbase.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkcddb COMPONENT Devel)
install( FILES libkcddb.kcfg DESTINATION ${KCFG_INSTALL_DIR})
DESTINATION ${INCLUDE_INSTALL_DIR}/libkcddb
COMPONENT Devel
)
install(TARGETS kcddb EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
FILES libkcddb.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)
install(
TARGETS kcddb
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)

View file

@ -1,18 +1,27 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/../libkcddb )
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/../libkcddb
)
MACRO(KCDDB_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_manual_test(kcddb-${_testname} ${_testname}.cpp)
target_link_libraries(kcddb-${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} kcddb)
target_link_libraries(kcddb-${_testname}
${KDE4_KDEUI_LIBS}
${QT_QTTEST_LIBRARY}
kcddb
)
ENDFOREACH(_testname)
ENDMACRO(KCDDB_EXECUTABLE_TESTS)
MACRO(KCDDB_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_test(kcddb-${_testname} ${_testname}.cpp)
target_link_libraries(kcddb-${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} kcddb)
target_link_libraries(kcddb-${_testname}
${KDE4_KDEUI_LIBS}
${QT_QTTEST_LIBRARY}
kcddb
)
ENDFOREACH(_testname)
ENDMACRO(KCDDB_UNIT_TESTS)

View file

@ -1,8 +1,6 @@
project(libkcompactdisc)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDES}
${KDE4_INCLUDES}
${KDE4_KDECORE_INCLUDES}
@ -10,21 +8,30 @@ include_directories(
${CMAKE_SOURCE_DIR}/solid
)
## Compiler flags
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS "-std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
endif()
find_package(Alsa)
alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
set(wmlib_audio_SRCS
# TODO: drop wmlib entirely?
if(CMAKE_SYSTEM_NAME STREQUAL GNU)
set(USE_WMLIB FALSE)
else ()
set(USE_WMLIB TRUE)
endif()
set(kcompactdisc_LIB_SRCS
kcompactdisc.cpp
kcompactdisc_p.cpp
phonon_interface.cpp
)
if(USE_WMLIB)
set(kcompactdisc_LIB_SRCS
${kcompactdisc_LIB_SRCS}
wmlib_interface.cpp
wmlib/audio/audio.c
wmlib/audio/audio_arts.c
wmlib/audio/audio_alsa.c
wmlib/audio/audio_sun.c
)
set(wmlib_SRCS
wmlib/cdda.c
wmlib/cddb.c
wmlib/cdrom.c
@ -47,23 +54,17 @@ set(wmlib_SRCS
wmlib/drv_sony.c
wmlib/drv_toshiba.c
)
if (CMAKE_SYSTEM_NAME STREQUAL GNU)
set(USE_WMLIB false)
else ()
set(USE_WMLIB true)
endif()
set(kcompactdisc_LIB_SRCS kcompactdisc.cpp kcompactdisc_p.cpp phonon_interface.cpp)
if (USE_WMLIB)
set(kcompactdisc_LIB_SRCS ${kcompactdisc_LIB_SRCS} wmlib_interface.cpp ${wmlib_SRCS} ${wmlib_audio_SRCS})
add_definitions(-DUSE_WMLIB=1)
endif(USE_WMLIB)
add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
target_link_libraries(kcompactdisc ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS})
target_link_libraries(kcompactdisc
${KDE4_KDECORE_LIBS}
${KDE4_PHONON_LIBS}
${KDE4_SOLID_LIBS}
)
if(HAVE_LIBASOUND2)
target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
endif(HAVE_LIBASOUND2)
@ -78,6 +79,14 @@ set_target_properties(kcompactdisc PROPERTIES
########### install files ###############
install(FILES kcompactdisc.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkcompactdisc COMPONENT Devel)
install(
FILES kcompactdisc.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkcompactdisc
COMPONENT Devel
)
install(TARGETS kcompactdisc EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
TARGETS kcompactdisc
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)

View file

@ -24,24 +24,16 @@
PROJECT(libkdcraw)
INCLUDE(MacroLibrary)
INCLUDE(MacroOptionalAddSubdirectory)
INCLUDE(FindPackageHandleStandardArgs)
INCLUDE(CMakePackageConfigHelpers)
# NOTE: Libraw 0.16.x is prefered version to use because it's ported to Cmake
# with full features supported. Until libraw 0.16.0 is release (ends of 2013),
# we will support previous version (with limited support)
FIND_PACKAGE(LibRaw 0.15)
FIND_PACKAGE(LibRaw VERSION 0.15 REQUIRED)
SET_PACKAGE_PROPERTIES(LibRaw PROPERTIES
DESCRIPTION "library that provides image Raw file demosaicing"
URL "http://www.libraw.org"
TYPE REQUIRED
PURPOSE "Required to build libkdcraw"
)
IF(NOT LIBRAW_FOUND)
RETURN()
ENDIF()
# Check LibRaw config header.
MESSAGE(STATUS "LibRaw version: ${LibRaw_VERSION_STRING}")
@ -53,15 +45,14 @@ ELSE()
MESSAGE(STATUS "LibRaw config file exists: no")
ENDIF()
ADD_DEFINITIONS(${QT_DEFINITIONS}
ADD_DEFINITIONS(
${QT_QTDBUS_DEFINITIONS}
${KDE4_DEFINITIONS}
${LibRaw_r_DEFINITIONS}
-DKDE_DEFAULT_DEBUG_AREA=51002
)
INCLUDE_DIRECTORIES(${QDBUS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
INCLUDE_DIRECTORIES(
${QDBUS_INCLUDE_DIRS}
${KDE4_INCLUDES}
${CMAKE_SOURCE_DIR}/threadweaver
${CMAKE_SOURCE_DIR}/solid
@ -71,9 +62,6 @@ INCLUDE_DIRECTORIES(${QDBUS_INCLUDE_DIRS}
${LibRaw_INCLUDE_DIR}
)
SET(LIBKDCRAW_AREA_CODE_GENERAL 51002)
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKDCRAW_AREA_CODE_GENERAL})
# ==================================================================================================
# Set env. variables accordinly.
@ -91,6 +79,13 @@ IF(ENABLE_TESTING)
ADD_SUBDIRECTORY(tests)
ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc
)
INSTALL(
FILES
${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
)

View file

@ -61,9 +61,14 @@ set_target_properties(kdcraw PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)
install(TARGETS kdcraw EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
TARGETS kdcraw
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
install(FILES
install(
FILES
rawdecodingsettings.h
kdcraw.h
dcrawsettingswidget.h

View file

@ -24,5 +24,8 @@
FILE(GLOB icmfiles *.icm *.icc)
INSTALL(FILES ${icmfiles}
DESTINATION ${DATA_INSTALL_DIR}/libkdcraw/profiles )
INSTALL(
FILES
${icmfiles}
DESTINATION ${DATA_INSTALL_DIR}/libkdcraw/profiles
)

View file

@ -24,10 +24,8 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libkdcraw)
SET(raw2png_SRCS raw2png.cpp)
ADD_EXECUTABLE(raw2png ${raw2png_SRCS})
TARGET_LINK_LIBRARIES(raw2png kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
KDE4_ADD_MANUAL_TESTS(kdcraw-raw2png raw2png.cpp)
TARGET_LINK_LIBRARIES(kdcraw-raw2png kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
SET(libinfo_SRCS libinfo.cpp)
ADD_EXECUTABLE(libinfo ${libinfo_SRCS})
KDE4_ADD_MANUAL_TESTS(kdcraw-libinfo libinfo.cpp)
TARGET_LINK_LIBRARIES(libinfo kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})

View file

@ -44,10 +44,16 @@ if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
set(kdeclarative_LIB_HEADERS
install(
FILES
kdeclarative.h
kdeclarative_export.h)
kdeclarative_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel
)
install(FILES ${kdeclarative_LIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)
install(TARGETS kdeclarative EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
TARGETS kdeclarative
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)

View file

@ -1,13 +1,22 @@
project(kdecore)
# Generate config-kstandarddirs.h
configure_file(config-kstandarddirs.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kstandarddirs.h )
configure_file(
config-kstandarddirs.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kstandarddirs.h
)
# Generate kdefakes.h
configure_file(kdefakes.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h )
configure_file(
kdefakes.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h
)
# Generate kdeversion.h
configure_file(util/kdeversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h )
configure_file(
util/kdeversion.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h
)
# Configure checks for kdirwatch
macro_optional_find_package(FAM)
@ -17,43 +26,66 @@ check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
# Generate io/config-kdirwatch.h
configure_file(io/config-kdirwatch.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/io/config-kdirwatch.h )
configure_file(
io/config-kdirwatch.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/io/config-kdirwatch.h
)
# Configure checks for network/ but also for netsupp.*
include(network/ConfigureChecks.cmake)
configure_file(network/config-network.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/network/config-network.h )
configure_file(
network/config-network.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/network/config-network.h
)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/network)
# Configure checks for date/
include(date/ConfigureChecks.cmake)
configure_file(date/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/date/config-date.h)
configure_file(
date/config-date.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/date/config-date.h
)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/date)
# Configure checks for compression/
include(compression/ConfigureChecks.cmake)
configure_file(compression/config-compression.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/compression/config-compression.h)
configure_file(
compression/config-compression.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/compression/config-compression.h
)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/compression)
# This file handles all the logic for compiling KAuth's backends
include(auth/ConfigureChecks.cmake)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/auth/ )
# Configure a small file to tell BackendsManager what to use
configure_file(auth/BackendsConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/BackendsConfig.h)
configure_file(
auth/BackendsConfig.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/BackendsConfig.h
)
# Configure checks for localization
configure_file(localization/config-localization.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-localization.h)
configure_file(
localization/config-localization.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-localization.h
)
# Configure checks for util
include(util/ConfigureChecks.cmake)
configure_file(util/config-util.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-util.h)
configure_file(
util/config-util.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-util.h
)
include_directories( ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES})
include_directories( ${ZLIB_INCLUDE_DIR} )
include_directories( ${QT_INCLUDES} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/sonnet/ )
include_directories(
${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES}
${ZLIB_INCLUDE_DIR}
${QT_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/auth
${CMAKE_CURRENT_SOURCE_DIR}/sonnet
)
# kdecore_OPTIONAL_SRCS is used to collect source files
# which are not always compiled into kdecore
@ -87,11 +119,11 @@ endif(LIBLZMA_FOUND)
if(LIBINTL_FOUND)
include_directories(${LIBINTL_INCLUDE_DIR})
set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${LIBINTL_LIBRARIES})
endif(LIBINTL_FOUND)
endif()
if(HAVE_RESOLV_LIBRARY)
set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} resolv)
endif (HAVE_RESOLV_LIBRARY)
endif()
add_subdirectory(kconfig_compiler)
if(ENABLE_TESTING)
@ -105,13 +137,16 @@ add_subdirectory( network/kssld )
add_library(kdefakes ${LIBRARY_TYPE} fakes.c)
set_target_properties(kdefakes PROPERTIES
VERSION ${KDE_NON_GENERIC_LIB_VERSION}
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION})
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
)
if(NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
endif (NOT HAVE_TRUNC)
endif()
install(TARGETS kdefakes
EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
install(
TARGETS kdefakes
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
########### next target ###############
@ -283,7 +318,7 @@ set_source_files_properties(util/kshareddatacache.cpp
if(NOT Q_WS_X11 AND NOT Q_WS_QWS)
add_definitions(-DNO_DISPLAY)
endif (NOT Q_WS_X11 AND NOT Q_WS_QWS)
endif()
add_library(kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS})
@ -299,13 +334,15 @@ target_link_libraries(kdecore PRIVATE
set(SYS_INOTIFY_H_FOUND 0)
if(SYS_INOTIFY_H_FOUND)
set_package_properties(FAM PROPERTIES DESCRIPTION "File alteration notification support via a separate service"
set_package_properties(FAM PROPERTIES
DESCRIPTION "File alteration notification support via a separate service"
URL "http://oss.sgi.com/projects/fam"
TYPE OPTIONAL
PURPOSE "You have file alteration notification support built into your kernel, however you might consider installing FAM as it also supports NFS."
)
else(SYS_INOTIFY_H_FOUND)
set_package_properties(FAM PROPERTIES DESCRIPTION "File alteration notification support via a separate service"
set_package_properties(FAM PROPERTIES
DESCRIPTION "File alteration notification support via a separate service"
URL "http://oss.sgi.com/projects/fam"
TYPE OPTIONAL
PURPOSE "Provides file alteration notification facilities using a separate service."
@ -317,7 +354,10 @@ if(FAM_FOUND)
target_link_libraries(kdecore PRIVATE ${FAM_LIBRARIES})
endif(FAM_FOUND)
target_link_libraries(kdecore PUBLIC ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
target_link_libraries(kdecore PUBLIC
${QT_QTDBUS_LIBRARY}
${QT_QTCORE_LIBRARY}
)
set_target_properties(kdecore PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
@ -325,7 +365,11 @@ set_target_properties(kdecore PROPERTIES
)
install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
TARGETS kdecore
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
########### next target ###############
@ -334,7 +378,8 @@ install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_A
set(KAUTH_BACKEND_SRCS ${KAUTH_BACKEND_SRCS} auth/AuthBackend.cpp)
kde4_add_plugin(kauth_backend_plugin ${KAUTH_BACKEND_SRCS})
target_link_libraries(kauth_backend_plugin ${KAUTH_BACKEND_LIBS})
install(TARGETS kauth_backend_plugin
install(
TARGETS kauth_backend_plugin
LIBRARY DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
ARCHIVE DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
RUNTIME DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
@ -346,7 +391,8 @@ install(TARGETS kauth_backend_plugin
kde4_add_plugin(kauth_helper_plugin ${KAUTH_HELPER_BACKEND_SRCS} auth/HelperProxy.cpp)
target_link_libraries(kauth_helper_plugin ${KAUTH_HELPER_BACKEND_LIBS})
install(TARGETS kauth_helper_plugin
install(
TARGETS kauth_helper_plugin
LIBRARY DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
ARCHIVE DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
RUNTIME DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
@ -354,7 +400,11 @@ install(TARGETS kauth_helper_plugin
########### next target ###############
configure_file(localization/all_languages.desktop ${CMAKE_CURRENT_BINARY_DIR}/all_languages @ONLY)
configure_file(
localization/all_languages.desktop
${CMAKE_CURRENT_BINARY_DIR}/all_languages
@ONLY
)
add_executable(kde4-config kde-config.cpp )
@ -366,10 +416,23 @@ install(TARGETS kde4-config ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### next target ###############
########### install files ###############
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${LOCALE_INSTALL_DIR} )
install( FILES localization/entry.desktop DESTINATION ${LOCALE_INSTALL_DIR}/en_US )
install( FILES kdebug.areas kdebugrc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES
install(
FILES
localization/entry.desktop
${CMAKE_CURRENT_BINARY_DIR}/all_languages
DESTINATION ${LOCALE_INSTALL_DIR}/en_US
)
install(
FILES
kdebug.areas
kdebugrc
DESTINATION ${CONFIG_INSTALL_DIR}
)
install(
FILES
kdecore_export.h
compression/kfilterbase.h
compression/karchive_export.h
@ -415,10 +478,6 @@ install( FILES
kernel/kcomponentdata.h
kernel/kstandarddirs.h
kernel/ktoolinvocation.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
install(FILES
network/klocalsocket.h
network/ksocketfactory.h
network/ktcpsocket.h
@ -471,13 +530,21 @@ install(FILES
util/qtest_kde.h
${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h
${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel
)
install( FILES sonnet/backgroundchecker.h sonnet/speller.h sonnet/globals.h
DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel)
install(
FILES
sonnet/backgroundchecker.h
sonnet/speller.h
sonnet/globals.h
DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet
COMPONENT Devel
)
install( FILES
install(
FILES
config/kconfigbackend.desktop
services/kplugininfo.desktop
sonnet/sonnetspeller.desktop

View file

@ -1,8 +1,8 @@
########################
# Helper backend probing
set(KAUTH_BACKEND "DBus" CACHE STRING "Specifies the KAuth helper backend to build. Current available options are
DBus. Not setting this variable will build the most appropriate backend for your system")
# not much of a choice really
set(KAUTH_BACKEND "DBus")
# Add the correct libraries/files depending on the backend
if(KAUTH_BACKEND STREQUAL "DBus")
@ -18,7 +18,8 @@ if (KAUTH_BACKEND STREQUAL "DBus")
qt4_add_dbus_adaptor(kauth_dbus_adaptor_SRCS
auth/backends/dbus/org.kde.auth.xml
auth/backends/dbus/DBusHelperProxy.h
KAuth::DBusHelperProxy)
KAuth::DBusHelperProxy
)
set(KAUTH_HELPER_BACKEND_SRCS
auth/backends/dbus/DBusHelperProxy.cpp
@ -27,12 +28,17 @@ if (KAUTH_BACKEND STREQUAL "DBus")
set(KAUTH_HELPER_BACKEND_LIBS kdecore)
# Install some files as well
install( FILES auth/backends/dbus/org.kde.auth.conf
DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
install(
FILES
auth/backends/dbus/org.kde.auth.conf
DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d
)
install( FILES auth/backends/dbus/dbus_policy.stub
install(
FILES
auth/backends/dbus/dbus_policy.stub
auth/backends/dbus/dbus_service.stub
DESTINATION ${DATA_INSTALL_DIR}/kauth COMPONENT Devel)
DESTINATION ${DATA_INSTALL_DIR}/kauth
COMPONENT Devel
)
endif()
## End

View file

@ -1,11 +1,13 @@
macro_optional_find_package(BZip2)
set_package_properties(BZip2 PROPERTIES DESCRIPTION "Support for BZip2 compressed files and data streams"
set_package_properties(BZip2 PROPERTIES
DESCRIPTION "Support for BZip2 compressed files and data streams"
URL "http://www.bzip.org"
TYPE RECOMMENDED
)
macro_optional_find_package(LibLZMA)
set_package_properties(LibLZMA PROPERTIES DESCRIPTION "Support for xz compressed files and data streams"
set_package_properties(LibLZMA PROPERTIES
DESCRIPTION "Support for xz compressed files and data streams"
URL "http://tukaani.org/xz/"
TYPE OPTIONAL
)

View file

@ -1,13 +1,12 @@
add_executable(kconfig_compiler kconfig_compiler.cpp)
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
add_executable(kconfig_compiler ${kconfig_compiler_SRCS})
target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY})
# "export" this target too so we can use the LOCATION property of the imported
# target in # FindKDE4Internal.cmake to get the full path to the installed
# executable instead of using FIND_PROGRAM(), Alex
install(TARGETS kconfig_compiler
EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
target_link_libraries(kconfig_compiler
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
)
install(
TARGETS kconfig_compiler
EXPORT kdelibsToolsTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)

View file

@ -22,10 +22,12 @@ int main()
{
QSslSocket *socket;
return 0;
}" HAVE_QSSLSOCKET)
}" HAVE_QSSLSOCKET
)
if (NOT HAVE_QSSLSOCKET)
message(SEND_ERROR "KDE Requires Qt to be built with SSL support")
endif (NOT HAVE_QSSLSOCKET)
endif()
macro_pop_required_vars()
endif(KATIE_FOUND)

View file

@ -1,19 +1,19 @@
kde4_add_plugin(kded_kssld kssld.cpp)
########### next target ###############
target_link_libraries(kded_kssld
${KDE4_KDECORE_LIBS}
${QT_QTNETWORK_LIBRARY}
)
set(kded_kssld_PART_SRCS kssld.cpp )
install(
TARGETS kded_kssld
DESTINATION ${PLUGIN_INSTALL_DIR}
)
kde4_add_plugin(kded_kssld ${kded_kssld_PART_SRCS})
target_link_libraries(kded_kssld ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY} )
install(TARGETS kded_kssld DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install( FILES kssld.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install(
FILES kssld.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kded
)

View file

@ -14,7 +14,11 @@ target_link_libraries(test_suggest ${KDE4_KDECORE_LIBS} )
MACRO(SONNET_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_test(sonnet-${_testname} ${_testname}.cpp)
target_link_libraries(sonnet-${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES})
target_link_libraries(sonnet-${_testname}
${KDE4_KDECORE_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTXML_LIBRARY}
)
ENDFOREACH(_testname)
ENDMACRO(SONNET_UNIT_TESTS)