1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
From: Nicholas D Steeves <sten@debian.org>
Date: Thu, 13 Jul 2023 18:56:23 -0400
Subject: Define documentation subdir
Forwarded: not-needed
---
CMakeLists.txt | 5 +++--
documentation/CMakeLists.txt | 36 ++++++++++++++++++------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4de945..4e2e43d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,8 +440,8 @@ ADD_SUBDIRECTORY(data/i18n)
ADD_SUBDIRECTORY(src/cli)
ADD_SUBDIRECTORY(src/player)
ADD_SUBDIRECTORY(src/gui)
-IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt)
- ADD_SUBDIRECTORY(data/doc)
+IF(EXISTS ${CMAKE_SOURCE_DIR}/documentation/CMakeLists.txt)
+ ADD_SUBDIRECTORY(documentation)
ENDIF()
INSTALL(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
IF(NOT MINGW AND NOT APPLE)
@@ -544,3 +544,4 @@ ADD_CUSTOM_TARGET(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" "${CMAKE_BINARY_DIR}/uninstall.cmake" IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/uninstall.cmake")
+
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index fe81693..ca1a66e 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -1,12 +1,12 @@
IF(MINGW)
- INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/doc/manual_en.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_en.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_fr.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_it.html
+ INSTALL( FILES ${CMAKE_SOURCE_DIR}/documentation/manual_en.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_en.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_fr.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_it.html
DESTINATION "data/doc" )
- INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/data/doc/img_tutorial
+ INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/documentation/img_tutorial
DESTINATION "data/doc" )
- INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/data/doc/img DESTINATION "data/doc"
+ INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/documentation/img DESTINATION "data/doc"
FILES_MATCHING PATTERN "*.png" PATTERN "*.svg"
PATTERN "*generated_ca/*" EXCLUDE
PATTERN "*generated_de/*" EXCLUDE
@@ -14,28 +14,28 @@ IF(MINGW)
PATTERN "*generated_fr/*" EXCLUDE
PATTERN "*generated_it/*" EXCLUDE
PATTERN "*generated_nl/*" EXCLUDE )
- INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/doc/res/docbook.css
- ${CMAKE_SOURCE_DIR}/data/doc/res/docbook.js
- ${CMAKE_SOURCE_DIR}/data/doc/res/LICENSE
+ INSTALL( FILES ${CMAKE_SOURCE_DIR}/documentation/res/docbook.css
+ ${CMAKE_SOURCE_DIR}/documentation/res/docbook.js
+ ${CMAKE_SOURCE_DIR}/documentation/res/LICENSE
DESTINATION "data/doc/res" )
ELSE()
# Install only the English version of the manual and all verions of
# the tutorial. The latter is not covered using DIRECTORY and
# PATTERN as this also would create a number of unnecessary
# subfolders.
- INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/doc/manual_en.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_en.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_fr.html
- ${CMAKE_SOURCE_DIR}/data/doc/tutorial_it.html
+ INSTALL( FILES ${CMAKE_SOURCE_DIR}/documentation/manual_en.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_en.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_fr.html
+ ${CMAKE_SOURCE_DIR}/documentation/tutorial_it.html
DESTINATION ${H2_SYS_PATH}/data/doc )
- INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/data/doc/img_tutorial
+ INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/documentation/img_tutorial
DESTINATION ${H2_SYS_PATH}/data/doc )
# Install only images used in the English version of the manual.
# This command also creates subfolders for all the generated dirs
# excluded below. Though they will be empty, it's still a little bit
# annoying. But it is a small price to pay for leaving the overall
# structure intact and easing development.
- INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/data/doc/img DESTINATION ${H2_SYS_PATH}/data/doc
+ INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/documentation/img DESTINATION ${H2_SYS_PATH}/data/doc
FILES_MATCHING PATTERN "*.png" PATTERN "*.svg"
PATTERN "*generated_ca/*" EXCLUDE
PATTERN "*generated_de/*" EXCLUDE
@@ -44,9 +44,9 @@ ELSE()
PATTERN "*generated_it/*" EXCLUDE
PATTERN "*generated_nl/*" EXCLUDE )
# Add further resources required by the English manual
- INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/doc/res/docbook.css
- ${CMAKE_SOURCE_DIR}/data/doc/res/docbook.js
- ${CMAKE_SOURCE_DIR}/data/doc/res/LICENSE
+ INSTALL( FILES ${CMAKE_SOURCE_DIR}/documentation/res/docbook.css
+ ${CMAKE_SOURCE_DIR}/documentation/res/docbook.js
+ ${CMAKE_SOURCE_DIR}/documentation/res/LICENSE
DESTINATION ${H2_SYS_PATH}/data/doc/res )
ENDIF()
|
