From 251e23422f37c93a3f460fb660c5e5bfa8200d91 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 2 Dec 2018 16:40:39 -0500
Subject: [PATCH] build system: Allow using utf8.h from the system.

---
 src/CMakeLists.txt               | 12 ++++++++----
 src/openboardview/CMakeLists.txt |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90442ed..26d4a69 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,10 +8,14 @@ if(NOT WIN32 OR MINGW)
 endif()
 
 ## utf8.h ##
-execute_process(
-	COMMAND git submodule update --init src/utf8
-	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
+FIND_PATH(UTF8_INCLUDE_DIR utf8.h)
+if(NOT UTF8_INCLUDE_DIR)
+  execute_process(
+    COMMAND git submodule update --init src/utf8
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+  set(UTF8_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utf8)
+endif()
 
 ## zlib ##
 find_package(ZLIB)
diff --git a/src/openboardview/CMakeLists.txt b/src/openboardview/CMakeLists.txt
index b0bdbe3..6c4564c 100644
--- a/src/openboardview/CMakeLists.txt
+++ b/src/openboardview/CMakeLists.txt
@@ -44,6 +44,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/..
 	${IMGUI_INCLUDE_DIRS}
+	${UTF8_INCLUDE_DIR}
 	${GLAD_INCLUDE_DIRS}
 	${GTK_INCLUDE_DIRS}
 	${OPENGL_INCLUDE_DIR}
-- 
2.34.0

guix/diff/gnu/services.scm?id=102a3a3a048aa6e01c6410ca073752eae7bdbbc5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services.scm'>
<input type='hidden' name='id' value='102a3a3a048aa6e01c6410ca073752eae7bdbbc5'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=102a3a3a048aa6e01c6410ca073752eae7bdbbc5'>root</a>/<a href='/guix/log/gnu?id=102a3a3a048aa6e01c6410ca073752eae7bdbbc5'>gnu</a>/<a href='/guix/log/gnu/services.scm?id=102a3a3a048aa6e01c6410ca073752eae7bdbbc5'>services.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services.scm?id=102a3a3a048aa6e01c6410ca073752eae7bdbbc5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-19 16:36:04 +0200'>2024-08-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=2cccf2f11c925c8bb04a6a28f363a3852f66d913'>services: Truly mark ‘setuid-program-service-type’ as deprecated.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-08-19 16:34:07 +0200'>2024-08-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=52ac2db924891ed66eb7fb7e6a4bd4af20333a83'>services: privileged-program: No libcap when cross-compiling to the Hurd.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=71f0676a295841e2cc662eec0d3e9b7e69726035'>privilege: Add POSIX capabilities(7) support.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=4e58dfee6c7456d1e662f66041b8a157efe8710a'>system: Add privileged-programs to &lt;operating-system&gt;.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=d73ca7ecb6e2dac91c13b8924ee6bed42c272980'>services: Rename setuid-program-service-type.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=f3b84be52dd8397abceb46219a15d5d78c982115'>build: Rename activate-setuid-programs.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=d6c9754c568588929c3350da8f7b17ae92d2b801'>services: setuid-program: Populate /run/privileged/bin.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-03-22 11:40:33 +0100'>2024-03-22</span></td><td><a href='/guix/commit/gnu/services.scm?id=29de2edfbbed21ac016f73a45d399795fc2e4dfb'>system, home: Validate ‘services’ field value.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-02-19 18:41:47 +0100'>2024-02-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=e73db355b127b9ca2b5339f645f2d3eb6929531f'>services: activation: Ensure /var/run existence.</a><span class='msg-avail'>...</span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2023-12-02 12:25:45 +0100'>2023-12-02</span></td><td><a href='/guix/commit/gnu/services.scm?id=b0715d7cd2a74bc231751f8afc9dffb2047501ac'>gnu: Use ‘libc-utf8-locales-for-target’.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-08-31 23:31:50 -0400'>2023-08-31</span></td><td><a href='/guix/commit/gnu/services.scm?id=f66fa5f917e76935187935b09ae7ac037b8b35f8'>gnu: services: Revert to deleting and updating all matching services</a><span class='msg-avail'>...</span></td><td>Brian Cully</td></tr>