generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-11-25 05:14:02 +00:00
parent 7e3fd7f5fd
commit 77ab17b595
30 changed files with 20 additions and 180 deletions

View file

@ -1,17 +1,11 @@
project(akregator)
#search packages used by KDE
set(QT_MIN_VERSION "4.8.2")
find_package(KDE4 4.14.3 REQUIRED)
include (KDE4Defaults)
# KDE/QT definitions we want
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories (${CMAKE_CURRENT_SOURCE_DIR}
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES})
${KDE4_INCLUDES}
)
include(CheckTypeSize)
check_type_size("long" SIZEOF_LONG)

View file

@ -80,10 +80,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/shared
)
find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
find_package( KDE4 4.8.4 REQUIRED )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") # Require C++11
# WORKAROUND for Clang bug: http://llvm.org/bugs/show_bug.cgi?id=15651

View file

@ -2,7 +2,6 @@ project(Amarok-Update-Signer)
cmake_minimum_required(VERSION 2.6.2)
find_package(Qt4 REQUIRED)
find_package(KDE4 REQUIRED) #Needed for the QCA2 check to work
find_package(QCA2 REQUIRED)

View file

@ -1,14 +1,11 @@
project(bluedevil)
find_package(KDE4 4.14.3 REQUIRED)
set(CMAKE_BLUEDEVIL_VERSION_MAJOR 2)
set(CMAKE_BLUEDEVIL_VERSION_MINOR 1)
set(CMAKE_BLUEDEVIL_VERSION_PATCH 1)
set(CMAKE_BLUEDEVIL_VERSION_STRING "${CMAKE_BLUEDEVIL_VERSION_MAJOR}.${CMAKE_BLUEDEVIL_VERSION_MINOR}.${CMAKE_BLUEDEVIL_VERSION_PATCH}")
configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
include(KDE4Defaults)
include(MacroOptionalAddSubdirectory)
find_package(SharedMimeInfo REQUIRED)

View file

@ -1,9 +1,5 @@
project(libbluedevil)
cmake_minimum_required(VERSION 2.6.4)
find_package(Qt4 REQUIRED)
include(CheckCXXCompilerFlag)
include(GNUInstallDirs)

View file

@ -1,9 +1,5 @@
project(DragonPlayer)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include_directories(${KDE4_INCLUDES})
include_directories(
@ -12,7 +8,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/src/app
${CMAKE_CURRENT_BINARY_DIR}
)
)
include(CheckIncludeFiles)
check_include_files(unistd.h HAVE_UNISTD_H)

View file

@ -1,9 +1,5 @@
project(ffmpegthumbs)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
include_directories(

View file

@ -1,10 +1,5 @@
project(gwenview)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include(MacroOptionalAddSubdirectory)
## Dependencies
find_package(JPEG)
macro_log_feature(JPEG_FOUND "libjpeg" "JPEG image manipulation support" "http://libjpeg.sourceforge.net/" TRUE)

View file

@ -1,14 +1,5 @@
project(kttsd)
find_package(KDE4 REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
find_package( Qt4 REQUIRED QT_USE_QT* )
include( ${QT_USE_FILE} )
enable_testing()
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )

View file

@ -1,10 +1,5 @@
project(kcron)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckSymbolExists)

View file

@ -1,25 +1,16 @@
project(filesharing)
if(NOT INSIDE_KDENETWORK)
message("Not building inside KDENetwork, loading KDE CMake Macros.")
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckPrototypeExists)
include(CheckTypeSize)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckPrototypeExists)
include(CheckTypeSize)
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
endif(NOT INSIDE_KDENETWORK)
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
add_subdirectory(samba)

View file

@ -2,10 +2,6 @@ project(kdeplasma-addons)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
find_package(KDE4 4.14.3 REQUIRED)
include (KDE4Defaults)
include(MacroLibrary)
macro_optional_find_package(KDE4Workspace)
macro_log_feature(KDE4WORKSPACE_FOUND "kdebase workspace" "KDE base workspace libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma plugins")

View file

@ -2,11 +2,6 @@
# Project needs a name of course
project(blackboard)
# Find the required Libaries
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(
${CMAKE_SOURCE_DIR}

View file

@ -1,9 +1,5 @@
project(liblancelot)
find_package(KDE4 4.14.3 REQUIRED)
include (KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
########### define variables ##########
set(LANCELOT_INCLUDE_DIR

View file

@ -7,19 +7,10 @@ set( KDEVPLATFORM_VERSION "1.${KDEVELOP_VERSION_MINOR}.${KDEVELOP_VERSION_PATCH}
################################################################################
cmake_minimum_required(VERSION 2.8.9)
project(KDevelop)
set(CMAKE_MODULE_PATH ${KDevelop_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
set(KDE_MIN_VERSION "4.7.0")
find_package(KDE4 4.7.0 REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
include (MacroOptionalAddSubdirectory)
find_package(QJSON)
# QJSON <=0.7.1 provides variables with lower case prefix, see bug 331426
if (QJSON_VERSION VERSION_LESS "0.7.2")

View file

@ -1,9 +1,5 @@
project(testqthelp)
cmake_minimum_required(VERSION 2.6)
find_package(Qt4 4.5.0 COMPONENTS QtCore QtGui QtHelp QtWebKit REQUIRED)
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
set(testqthelp_SRCS docwidget.cpp main.cpp)
qt4_wrap_ui(testqthelp_SRCS docwidget.ui)

View file

@ -1,9 +1,6 @@
project(ghprovider)
find_package(KDE4 4.14.3 REQUIRED)
include (KDE4Defaults)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
if(NOT QJSON_FOUND)
message("Could not find QJson" FATAL_ERROR)

View file

@ -12,14 +12,10 @@ set(KDEVPLATFORM_LIB_SOVERSION 8)
################################################################################
cmake_minimum_required(VERSION 2.8.9)
project(KDevPlatform)
set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules)
set(KDE_MIN_VERSION "4.7.0")
find_package(KDE4 4.7.0 REQUIRED)
find_package(Grantlee 0.1.7)
find_package(QJSON)
macro_log_feature( Grantlee_FOUND "Grantlee" "Grantlee templating library, needed for file templates" "http://www.grantlee.org/" TRUE "0.1.7")
@ -31,10 +27,6 @@ if (QJSON_VERSION VERSION_LESS "0.7.2")
set(QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
endif()
include (KDE4Defaults)
include (MacroWriteBasicCMakeVersionFile)
include (MacroLibrary)
# Make sure that we're having RPATH on our installed libs, else using kdevelop
# from prefixes like $HOME/kdevelop breaks
# Code taken from FindKDE4Internal.cmake for KDE 4.5

View file

@ -1,10 +1,5 @@
project(kfilemetadata)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
find_package(PopplerQt4 0.12.1)
set_package_properties(PopplerQt4 PROPERTIES DESCRIPTION "A PDF rendering library"
URL "http://poppler.freedesktop.org" TYPE OPTIONAL

View file

@ -19,8 +19,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Tell CMake about or own modules
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
find_package(KDE4 4.14.3 REQUIRED)
include( KDE4Defaults )
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
@ -61,9 +59,6 @@ endif()
# Set up Qt
#####################################################################
message(STATUS "Building for Qt4...")
set(QT_MIN_VERSION "4.6.0")
# Select a Qt installation here, if you don't want to use system Qt
if(QT_PATH)
# FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
@ -76,8 +71,6 @@ endif()
# using -DCMAKE_DISABLE_FIND_PACKAGE_<PkgName>=TRUE
#####################################################################
find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED)
add_feature_info("QtDBus module" QT_QTDBUS_FOUND "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments")
if (QT_QTDBUS_FOUND)
find_package(dbusmenu-qt QUIET CONFIG)

View file

@ -1,5 +1,3 @@
find_package(KDE4 REQUIRED)
find_package(Qt4 COMPONENTS QtGui QtCore QtXml REQUIRED)
find_package(LibXslt REQUIRED)
include(${QT_USE_FILE})

View file

@ -5,17 +5,12 @@ set(libkscreen_VERSION_RELEASE 4)
set(libkscreen_VERSION "${libkscreen_VERSION_MAJOR}.${libkscreen_VERSION_MINOR}.${libkscreen_VERSION_RELEASE}")
add_definitions(-DLIBKSCREEN_VERSION="${libkscreen_VERSION}")
cmake_minimum_required(VERSION 2.8.0)
if(POLICY CMP0017)
cmake_policy(SET CMP0017 NEW)
endif()
enable_testing()
find_package(Qt4 REQUIRED)
find_package(KDE4 4.14.3 REQUIRED)
find_package(QJSON 0.8 REQUIRED)
include(KDE4Defaults)
add_definitions(${KDE4_DEFINITIONS})
include(CheckCXXCompilerFlag)

View file

@ -1,12 +1,5 @@
cmake_minimum_required(VERSION 2.8)
project(lokalize)
# search packages used by KDE
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
find_package(HUNSPELL)

View file

@ -17,8 +17,6 @@
project(partitionmanager)
cmake_minimum_required(VERSION 2.6.2)
set(CMAKE_USE_RELATIVE_PATHS OFF)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
@ -29,19 +27,13 @@ set(VERSION_SUFFIX "")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
add_definitions(-DVERSION="${VERSION}")
find_package(KDE4 4.14.3 REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(BLKID REQUIRED blkid)
pkg_check_modules(LIBATASMART REQUIRED libatasmart)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(${KDE4_ENABLE_EXCEPTIONS})
include(KDE4Defaults)
include(MacroLibrary)
include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
include_directories(${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
add_subdirectory(lib)
add_subdirectory(src)

View file

@ -2,11 +2,6 @@ cmake_minimum_required(VERSION 2.6)
project(skanlite)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include_directories (${KDE4_INCLUDES})
find_package(PNG REQUIRED)
set(SKANLITE_VERSION_MAJOR "1")

View file

@ -1,15 +1,11 @@
project(svgpart)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
set(svgpart_SRCS
svgpart.cpp
)
svgpart.cpp
)
kde4_add_plugin(svgpart ${svgpart_SRCS})

View file

@ -1,10 +1,5 @@
project(kdegraphics-thumbnailers)
find_package(KDE4 4.14.3 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include(MacroOptionalAddSubdirectory)
add_definitions(
${QT_DEFINITIONS}
${KDE4_DEFINITIONS}
@ -22,7 +17,6 @@ set_package_properties(GettextPO PROPERTIES
)
macro_optional_add_subdirectory(audio)
macro_optional_add_subdirectory(ps)
macro_optional_add_subdirectory(raw)

View file

@ -1,10 +1,5 @@
project(AudioThumbs)
cmake_minimum_required(VERSION 2.6.2)
find_package(KDE4 REQUIRED)
include (KDE4Defaults)
set(WITH_TAGLIB ON CACHE BOOL "build with TagLib")
set(WITH_FLAC ON CACHE BOOL "build with FLAC")

View file

@ -1,15 +1,6 @@
project(kde-thumbnailer-po)
cmake_minimum_required(VERSION 2.6)
find_package(KDE4 REQUIRED)
find_package(GettextPO REQUIRED)
include(KDE4Defaults)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${QT_INCLUDES} ${KDE4_INCLUDES})
set(pothumbnail_SRCS pocreator.cpp pocreatorform.ui)
set(pothumbnail_SRCS pocreator.cpp)
kde4_add_kcfg_files(pothumbnail_SRCS pocreatorsettings.kcfgc)

View file

@ -1,11 +1,5 @@
project(yakuake)
set(KDE_MIN_VERSION "4.7.1")
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
include(KDE4Defaults)
add_subdirectory( app )
add_subdirectory( data )
# FIXME: move to kde-l10n