[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-doc-english
Subject: =?utf-8?q?=5Bsdk/kdesrc-build=5D_/=3A_Allow_to_build/install_doc_in_kf6_too?=
From: Laurent Montel <null () kde ! org>
Date: 2023-11-12 19:39:11
Message-ID: 20231112193911.CE1A51400692 () lerwini ! kde ! org
[Download RAW message or body]
Git commit 5a0754e7c34ab20d6555f9759921c6b6a9e136c2 by Laurent Montel.
Committed on 12/11/2023 at 18:56.
Pushed by redstrate into branch 'master'.
Allow to build/install doc in kf6 too
M +6 -1 CMakeLists.txt
M +3 -3 doc/index.docbook
https://invent.kde.org/sdk/kdesrc-build/-/commit/5a0754e7c34ab20d6555f9759921c6b6a9e136c2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 376e74f7..9c05382f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,12 @@ if (ECM_FOUND)
if(KF5_DocTools_FOUND)
ecm_optional_add_subdirectory(doc)
else()
- message(WARNING "Found ECM, but not KF5::DocTools; documentation will not be \
built") + find_package(KF6 5.10.0 COMPONENTS DocTools)
+ if(KF6_DocTools_FOUND)
+ ecm_optional_add_subdirectory(doc)
+ else()
+ message(WARNING "Found ECM, but not KF5::DocTools; documentation will \
not be built") + endif()
endif()
else()
message(WARNING "Did not find extra-cmake-modules; documentation will not be \
built and install paths will be guessed based on CMake settings.")
diff --git a/doc/index.docbook b/doc/index.docbook
index 65d979eb..2d2f2b79 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -771,7 +771,7 @@ configuration file option.</para>
in pretend mode.</para></note>
<para>This driver works by setting up a custom \
<quote><literal>xsession</literal></quote>
-session type. This type of session should work by default with the &kdm; login
+session type. This type of session should work by default with the ssdm login
manager (where it appears as a <quote>Custom</quote> session), but other login
managers (such as <application>LightDM</application> and
<application>gdm</application>) may require additional files installed to
@@ -5055,7 +5055,7 @@ create it if necessary. Add the line:
<important><para>On some distributions, it may be necessary to perform the same
steps with the <filename>.xsession</filename> file, also in the home directory.
This is especially true when using graphical login managers such as
-&kdm;, <application>gdm</application>, or <application>xdm</application>.</para>
+ssdm, <application>gdm</application>, or <application>xdm</application>.</para>
</important>
<para>
@@ -5068,7 +5068,7 @@ text terminals and the following six are graphical displays.
<para>
If when you start your computer you are presented to the graphical display
manager instead, you can use the new &kde; environment, even if it is not listed
-as an option. Most display managers, including &kdm;, have an option to use
+as an option. Most display managers, including ssdm, have an option to use
a <quote>Custom Session</quote> when you login. With this option, your session \
settings are loaded from the <filename>.xsession</filename> file in your home \
directory. If you have already modified this file as described above, this option \
should load
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic