Git commit 12f6bb83dba384666393ae8e795c0abfeec562d5 by Gilles Caulier. Committed on 29/11/2022 at 06:46. Pushed by cgilles into branch 'master'.
compile with new KF5 M +16 -5 CMakeLists.txt M +1 -1 bootstrap.sh M +1 -1 digikam/CMakeLists.txt M +1 -1 digikam/index.docbook M +1 -1 showfoto/CMakeLists.txt M +1 -1 showfoto/index.docbook https://invent.kde.org/documentation/digikam-doc/commit/12f6bb83dba384666393ae8e795c0abfeec562d5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 249f6f7..646922b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,14 @@ # -# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2022, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. project(digikam-doc) -set(CMAKE_MIN_VERSION "3.0.0") -set(ECM_MIN_VERSION "1.5.0") -set(KF5_MIN_VERSION "5.1.0") +set(CMAKE_MIN_VERSION "3.16") +set(ECM_MIN_VERSION "5.55.0") +set(KF5_MIN_VERSION "5.55.0") cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) @@ -17,9 +17,20 @@ cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +# KF5 Framework macros include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + +# ECM macros +include(ECMSetupVersion) +include(ECMOptionalAddSubdirectory) +include(ECMInstallIcons) +include(ECMPoQmTools) + +# Cmake macros +include(CMakePackageConfigHelpers) +include(CheckFunctionExists) include(FeatureSummary) ############## Find Packages ################### diff --git a/bootstrap.sh b/bootstrap.sh index fd15f43..3d2dbbd 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2008-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2008-2022, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt index dc70c40..f3f2e00 100644 --- a/digikam/CMakeLists.txt +++ b/digikam/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2022, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/digikam/index.docbook b/digikam/index.docbook index 26cc8b1..bb22406 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -209,7 +209,7 @@ <title>The &digikam; Handbook</title> <copyright> <year>2001</year> - <year>2020</year> + <year>2022</year> <holder>The <ulink url="http://www.digikam.org";>digiKam</ulink> developers team</holder> </copyright> diff --git a/showfoto/CMakeLists.txt b/showfoto/CMakeLists.txt index d39758e..c58b95a 100644 --- a/showfoto/CMakeLists.txt +++ b/showfoto/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2022, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/showfoto/index.docbook b/showfoto/index.docbook index cc5f467..0dc4a4d 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -118,7 +118,7 @@ <title>The &digikam; Handbook</title> <copyright> <year>2001</year> - <year>2020</year> + <year>2022</year> <holder>The <ulink url="http://www.digikam.org";>digiKam</ulink> developers team</holder> </copyright>
