KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge branch 'master' into multiple_apis

Browse source 
Conflicts:
	CMakeLists.txt
	src/libdanbooru/danboorupool.cpp
	src/libdanbooru/danboorupost.cpp
	src/libdanbooru/danboorutag.cpp
	src/libdanbooru/utils.cpp
This commit is contained in:
Luca Beltrame 2019-06-08 15:20:17 +02:00
commit 3409fcecf9
Signed by: einar
GPG key ID: 8DF631FD021DB0C5
13 changed files with 373 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

22
CMakeLists.txt
View file

@ -7,7 +7,20 @@ set(danbooru_client_VERSION_PATCH 0)
set (danbooru_VERSION ${danbooru_client_VERSION_MAJOR}.${danbooru_client_VERSION_MINOR}.${danbooru_client_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION_MAJOR "${danbooru_client_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${danbooru_client_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${danbooru_client_VERSION_PATCH}")
set(CPACK_SOURCE_GENERATOR "TXZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_SOURCE_IGNORE_FILES
"/build/;/.bzr/;~$;/.git/;${CPACK_SOURCE_IGNORE_FILES}")
include(CPack)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
find_package (ECM REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(REQUIRED_QT_VERSION "5.4.0")
@ -29,6 +42,7 @@ find_package(Qt5Test ${REQUIRED_QT_VERSION})
find_package(KF5 ${KF5_VERSION} REQUIRED
IconThemes # Handling of icons
CoreAddons # Caches
TextWidgets # Spin boxes
GuiAddons # Image cache
Completion # KComboBox
XmlGui # User interface
@ -37,23 +51,17 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
Wallet # Password handling
Declarative # QML
I18n # i18n
FileMetaData # Tagging
# DocTools # Disabled until manual's ready
)
# Not a framework yet, hence separate
find_package(KF5 "5.6.0" COMPONENTS
FileMetaData)
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
include(FeatureSummary)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set_package_properties(KF5FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging")
set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Required to build tests")
# add_subdirectory( doc )