#2 cmake conversion

Merged
SlavekB merged 3 commits from feat/cmakeConv into master 3 months ago
cethyel commented 3 months ago

I’ve added a man page taken from your Debian packaging system.
I’ve also made two folders in doc (en, fr) and put the help pages in them.

I've added a man page taken from your Debian packaging system. I've also made two folders in doc (en, fr) and put the help pages in them.
SlavekB reviewed 3 months ago
It looks good. Please make a minor edit of the bug report mentioned below. Regarding the way for work with tarballs, you do not have to deal with this at this point. Testing from my side will only be done later.
ConfigureChecks.cmake
@@ -0,0 +48,4 @@
48
+
49
+pkg_search_module( ARTS arts )
50
+if( NOT ARTS_FOUND )
51
+    message( FATAL_ERROR "\naRts is requested, but was not found on your system" )
SlavekB

Instead of message( FATAL_ERROR … ) would be good to use tde_message_fatal( … ). In this case, then message without an initial \n.

Since arts is not subject to a choice like WITH_ARTS option, then required rather than requested is better.

Instead of `message( FATAL_ERROR … )` would be good to use `tde_message_fatal( … )`. In this case, then message without an initial `\n`. Since `arts` is not subject to a choice like WITH_ARTS option, then *required* rather than *requested* is better.
@@ -0,0 +18,4 @@
18
+        KBDefault.tar.gz
19
+        KSDefault.tar.gz
20
+        KCDefault.tar.gz
21
+        
SlavekB

Ha, another module where tarballs are part of the source code!

I suppose there will also be a good idea to unpack content and create tarballs during building… as we solved it in Quanta – see TDE/tdewebdev#3. In this case, it may be a good reason to move the tde_create_tarball macro to a common cmake module.

Ha, another module where tarballs are part of the source code! I suppose there will also be a good idea to unpack content and create tarballs during building… as we solved it in Quanta – see TDE/tdewebdev#3. In this case, it may be a good reason to move the [`tde_create_tarball`](../tdewebdev/src/commit/92ba2fb52a9c257eb9f21619c51eb225b7af7d73/quanta/data/toolbars/CMakeLists.txt#L17) macro to a common cmake module.
@@ -12,3 +12,3 @@
12 12
 "Language-Team: LANGUAGE <LL@li.org>\n"
13 13
 "MIME-Version: 1.0\n"
14
-"Content-Type: text/plain; charset=CHARSET\n"
14
+"Content-Type: text/plain; charset=UTF-8\n"
SlavekB

Thanks for this fix.

Thanks for this fix.
SlavekB commented 3 months ago
Owner

I have made several changes to the build rules for documentation:

  1. Added the CMake rule for installing English documentation – it was missing in your conversion.
  2. Edited the automake rules to install the documentation from the subdirectories – automake builds so far will be functional.
  3. Removed the French documentation because it contains nothing. I found that the nasty formatting of this documentation was because of the preparation for using the poxml tool to translate documentation using PO files. I tested that we would probably use po4a instead of the poxml tool in the future.
I have made several changes to the build rules for documentation: 1. Added the CMake rule for installing English documentation – it was missing in your conversion. 2. Edited the automake rules to install the documentation from the subdirectories – automake builds so far will be functional. 3. Removed the French documentation because it contains nothing. I found that the nasty formatting of this documentation was because of the preparation for using the poxml tool to translate documentation using PO files. I tested that we would probably use po4a instead of the poxml tool in the future.
SlavekB deleted branch feat/cmakeConv 3 months ago
SlavekB added this to the R14.0.6 release milestone 3 months ago
The pull request has been merged.
Sign in to join this conversation.
Loading…
Cancel
Save
There is no content yet.