From 22253b9ab6fe424eabaaf39efab3f3a78277caed Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 26 Dec 2013 17:38:46 +0100 Subject: [PATCH] Build system fixes --- CMakeLists.txt | 17 +++++++++++++++-- src/CMakeLists.txt | 1 - 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da6696e..12f3289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,23 @@ project(danbooru_client) +cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) + set(danbooru_client_VERSION_MAJOR 0) set(danbooru_client_VERSION_MINOR 1) find_package(KDE4 REQUIRED) +find_package(QJSON) + include (KDE4Defaults) -find_package(QJSON REQUIRED) +include (FeatureSummary) + +set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries" + URL "http://www.kde.org" TYPE REQUIRED + PURPOSE "Required to build Danbooru Client") +set_package_properties(QJSON PROPERTIES DESCRIPTION "The QJSON library" + URL "http://qjson.sourceforge.net" TYPE REQUIRED + PURPOSE "Required to build Danbooru Client") + include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ) @@ -13,7 +25,8 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(-DQT_USE_QSTRINGBUILDER) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - #add_subdirectory( doc ) add_subdirectory( src ) add_subdirectory( icons ) + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b99e25a..8a90919 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,6 @@ set(danbooru_client_SRCS danbooruconnectwidget.cpp #kde4_add_ui_files(danbooru_client_SRCS danbooru_clientview_base.ui prefs_base.ui) #kde4_add_kcfg_files(danbooru_client_SRCS settings.kcfgc ) - add_subdirectory(libdanbooru) include_directories(