[kde-dev-scripts] /: Move cmake to use only KF5 dependencies

Luigi Toscano null at kde.org
Sat Aug 19 14:32:36 UTC 2017 

Git commit 1799197a1d39104d10a2c2400341b818452656be by Luigi Toscano.
Committed on 19/08/2017 at 12:44.
Pushed by ltoscano into branch 'master'.

Move cmake to use only KF5 dependencies

- remove the kdelibs4-related logic;
- always looks for ECM (bumping a bit the minimum cmake on the way)
  and use its variables, with optional KDocTools
- use the native KF5 DTD for the documentation

General ack on the change received on release-team at kde.org.

M  +17   -28   CMakeLists.txt
M  +18   -20   doc/CMakeLists.txt
M  +1    -1    doc/man-adddebug.1.docbook
M  +1    -1    doc/man-cheatmake.1.docbook
M  +1    -1    doc/man-create_cvsignore.1.docbook
M  +1    -1    doc/man-create_makefile.1.docbook
M  +1    -1    doc/man-create_makefiles.1.docbook
M  +1    -1    doc/man-cvscheck.1.docbook
M  +1    -1    doc/man-cvslastchange.1.docbook
M  +1    -1    doc/man-cvslastlog.1.docbook
M  +1    -1    doc/man-cvsrevertlast.1.docbook
M  +1    -1    doc/man-cxxmetric.1.docbook
M  +1    -1    doc/man-extend_dmalloc.1.docbook
M  +1    -1    doc/man-extractrc.1.docbook
M  +1    -1    doc/man-fixincludes.1.docbook
M  +1    -1    doc/man-pruneemptydirs.1.docbook
M  +1    -1    doc/man-qtdoc.1.docbook
M  +1    -1    doc/man-reportview.1.docbook
M  +1    -1    doc/man-transxx.1.docbook
M  +1    -1    doc/man-zonetab2pot.py.1.docbook

https://commits.kde.org/kde-dev-scripts/1799197a1d39104d10a2c2400341b818452656be

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d7b7f4..7479263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,13 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.12)
 project(kde-dev-scripts)
-include(FeatureSummary)
 
-find_package(KF5DocTools)
-if(KF5DocTools_FOUND)
-  find_package(ECM 1.3.0 REQUIRED NO_MODULE)
-  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-  include(KDEInstallDirs)
-  function(create_manpage)
-    kdoctools_create_manpage(${ARGN})
-  endfunction()
-else()
-  find_package(KDE4)
-  function(create_manpage)
-    kde4_create_manpage(${ARGN})
-  endfunction()
-endif()
+find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-if (KDE4_FOUND)
-  include(KDE4Defaults)
-  include(MacroLibrary)
-else()
-  set(BIN_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/bin"  CACHE PATH "The install dir for executables")
-endif()
+include(FeatureSummary)
+include(KDEInstallDirs)
+
+find_package(KF5 COMPONENTS DocTools)
 
 # Note that all of these files should be *scripts* that do not require
 # compilation, therefore we simply install them. We split out Bourne shell
@@ -30,9 +15,13 @@ endif()
 # ones behave well on Mac or Windows just because we don't elide those too.
 
 ########### install files ###############
-if (UNIX)
+if(UNIX)
 #shell program
-add_subdirectory( doc )
+
+if(KF5DocTools_FOUND)
+  add_subdirectory(doc)
+endif()
+
 install(PROGRAMS
   adddebug
   build-progress.sh
@@ -65,14 +54,14 @@ install(PROGRAMS
   uncrustify-kf5
   wcgrep
   draw_lib_dependencies
-  DESTINATION ${BIN_INSTALL_DIR})
+  DESTINATION ${KDE_INSTALL_BINDIR})
 
 install(FILES
   uncrustify-kf5.cfg
   uncrustify-qt.cfg
-  DESTINATION ${DATA_INSTALL_DIR}/uncrustify)
+  DESTINATION ${KDE_INSTALL_DATADIR}/uncrustify)
 
-endif (UNIX)
+endif()
 
 install(PROGRAMS
   create_makefile
@@ -104,6 +93,6 @@ install(PROGRAMS
   kde-systemsettings-tree.py
   reviewboard-am
   grantlee_strings_extractor.py
-  DESTINATION ${BIN_INSTALL_DIR})
+  DESTINATION ${KDE_INSTALL_BINDIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 642f1af..212d409 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,22 +1,20 @@
-
-
 ########### install files ###############
 
-create_manpage(man-adddebug.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cheatmake.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-create_cvsignore.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-create_makefile.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-create_makefiles.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cvscheck.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cvslastchange.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cvslastlog.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cvsrevertlast.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cxxmetric.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-extend_dmalloc.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-extractrc.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-fixincludes.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-pruneemptydirs.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-qtdoc.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-reportview.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-transxx.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-zonetab2pot.py.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+kdoctools_create_manpage(man-adddebug.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cheatmake.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-create_cvsignore.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-create_makefile.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-create_makefiles.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cvscheck.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cvslastchange.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cvslastlog.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cvsrevertlast.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-cxxmetric.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-extend_dmalloc.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-extractrc.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-fixincludes.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-pruneemptydirs.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-qtdoc.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-reportview.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-transxx.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-zonetab2pot.py.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
diff --git a/doc/man-adddebug.1.docbook b/doc/man-adddebug.1.docbook
index 343ddfb..f85c92e 100644
--- a/doc/man-adddebug.1.docbook
+++ b/doc/man-adddebug.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-cheatmake.1.docbook b/doc/man-cheatmake.1.docbook
index 4fdb949..8d0bcdd 100644
--- a/doc/man-cheatmake.1.docbook
+++ b/doc/man-cheatmake.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-create_cvsignore.1.docbook b/doc/man-create_cvsignore.1.docbook
index 1433d4e..c518aeb 100644
--- a/doc/man-create_cvsignore.1.docbook
+++ b/doc/man-create_cvsignore.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY kdeoptions SYSTEM "kdeoptions.docbook">
 <!ENTITY qtoptions SYSTEM "qtoptions.docbook">
 <!ENTITY % English "INCLUDE">
diff --git a/doc/man-create_makefile.1.docbook b/doc/man-create_makefile.1.docbook
index eb3fa85..1a8a32c 100644
--- a/doc/man-create_makefile.1.docbook
+++ b/doc/man-create_makefile.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY kdeoptions SYSTEM "kdeoptions.docbook">
 <!ENTITY qtoptions SYSTEM "qtoptions.docbook">
 <!ENTITY % English "INCLUDE">
diff --git a/doc/man-create_makefiles.1.docbook b/doc/man-create_makefiles.1.docbook
index edc1115..0ba7fb7 100644
--- a/doc/man-create_makefiles.1.docbook
+++ b/doc/man-create_makefiles.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY create_makefiles "<command>create_makefiles</command>">
 <!ENTITY % English "INCLUDE">
 ]>
diff --git a/doc/man-cvscheck.1.docbook b/doc/man-cvscheck.1.docbook
index b113f35..bc05a29 100644
--- a/doc/man-cvscheck.1.docbook
+++ b/doc/man-cvscheck.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY cvscheck "<command>cvscheck</command>">
 <!ENTITY CVS "<acronym>CVS</acronym>">
 <!ENTITY % English "INCLUDE">
diff --git a/doc/man-cvslastchange.1.docbook b/doc/man-cvslastchange.1.docbook
index eb86d96..8206f0b 100644
--- a/doc/man-cvslastchange.1.docbook
+++ b/doc/man-cvslastchange.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY cvslastchange "<command>cvslastchange</command>">
 <!ENTITY CVS "<acronym>CVS</acronym>">
 <!ENTITY % English "INCLUDE">
diff --git a/doc/man-cvslastlog.1.docbook b/doc/man-cvslastlog.1.docbook
index ed59f42..66c3828 100644
--- a/doc/man-cvslastlog.1.docbook
+++ b/doc/man-cvslastlog.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-cvsrevertlast.1.docbook b/doc/man-cvsrevertlast.1.docbook
index 8af8d65..e46ccaa 100644
--- a/doc/man-cvsrevertlast.1.docbook
+++ b/doc/man-cvsrevertlast.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-cxxmetric.1.docbook b/doc/man-cxxmetric.1.docbook
index f37d4a7..c61d83f 100644
--- a/doc/man-cxxmetric.1.docbook
+++ b/doc/man-cxxmetric.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-extend_dmalloc.1.docbook b/doc/man-extend_dmalloc.1.docbook
index ef85d1f..cd92718 100644
--- a/doc/man-extend_dmalloc.1.docbook
+++ b/doc/man-extend_dmalloc.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-extractrc.1.docbook b/doc/man-extractrc.1.docbook
index 6739c4a..0c907ee 100644
--- a/doc/man-extractrc.1.docbook
+++ b/doc/man-extractrc.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-fixincludes.1.docbook b/doc/man-fixincludes.1.docbook
index a4850dd..18fac15 100644
--- a/doc/man-fixincludes.1.docbook
+++ b/doc/man-fixincludes.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-pruneemptydirs.1.docbook b/doc/man-pruneemptydirs.1.docbook
index ee5046a..e26dafb 100644
--- a/doc/man-pruneemptydirs.1.docbook
+++ b/doc/man-pruneemptydirs.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-qtdoc.1.docbook b/doc/man-qtdoc.1.docbook
index 7491089..fc36bd4 100644
--- a/doc/man-qtdoc.1.docbook
+++ b/doc/man-qtdoc.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-reportview.1.docbook b/doc/man-reportview.1.docbook
index 9e05056..ef2af2f 100644
--- a/doc/man-reportview.1.docbook
+++ b/doc/man-reportview.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY Ian.Reinhart.Geiser "<personname><firstname>Ian</firstname><othername>Reinhart</othername><surname>Geiser</surname></personname>">
 <!ENTITY Ian.Reinhart.Geiser.mail "<email>geiseri at kde.org</email>">
 <!ENTITY kweather "<application>kweather</application>">
diff --git a/doc/man-transxx.1.docbook b/doc/man-transxx.1.docbook
index 740ea3a..e23fd61 100644
--- a/doc/man-transxx.1.docbook
+++ b/doc/man-transxx.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>
 
diff --git a/doc/man-zonetab2pot.py.1.docbook b/doc/man-zonetab2pot.py.1.docbook
index 308e763..ab79060 100644
--- a/doc/man-zonetab2pot.py.1.docbook
+++ b/doc/man-zonetab2pot.py.1.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 <!ENTITY % English "INCLUDE">
 ]>

More information about the kde-doc-english mailing list