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

commit</a><a href='/guix/diff/gnu/services/nfs.scm?id=9de12df7883ed5018d3a22548e34a60881933396'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/nfs.scm'>
<input type='hidden' name='id' value='9de12df7883ed5018d3a22548e34a60881933396'/><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=9de12df7883ed5018d3a22548e34a60881933396'>root</a>/<a href='/guix/log/gnu?id=9de12df7883ed5018d3a22548e34a60881933396'>gnu</a>/<a href='/guix/log/gnu/services?id=9de12df7883ed5018d3a22548e34a60881933396'>services</a>/<a href='/guix/log/gnu/services/nfs.scm?id=9de12df7883ed5018d3a22548e34a60881933396'>nfs.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/nfs.scm?id=9de12df7883ed5018d3a22548e34a60881933396&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-01-19 17:28:31 +0100'>2018-01-19</span></td><td><a href='/guix/commit/gnu/services/nfs.scm?id=162a13740041f907f0ce5c2aa05b52b162b4e81a'>gnu: Consistently Write ‘file system(s)’.</a><span class='msg-avail'>...<span class='msg-tooltip'>It is the GNU way.

* doc/guix.texi (Build Systems, DNS Services): Write ‘file system(s)’.
* gnu/build/vm.scm (create-ext-file-system, create-fat-file-system):
Likewise.
* gnu/packages/backup.scm (dirvish, rsnapshot)[description]: Likewise.
* gnu/packages/check.scm (python-testpath)[description]: Likewise.
* gnu/packages/disk.scm (pydf)[description]: Likewise.
* gnu/packages/file-systems.scm (disorderfs)[synopsis, description]: Likewise.
(glusterfs)[description]: Likewise.
* gnu/packages/haskell.scm (ghc-directory, ghc-system-fileio-bootstrap)
(ghc-system-fileio)[synopsis]: Likewise.
(ghc-fsnotify)[description]: Likewise.
* gnu/packages/linux.scm (proot)[description]: Likewise.
(jmtpfs)[synopsis, description]: Likewise.
* gnu/packages/mate.scm (caja, caja-extensions)[description]: Likewise.
* gnu/packages/storage.scm (ceph)[description]: Likewise.
* gnu/packages/sync.scm (lsyncd)[description]: Likewise.
* gnu/packages/syncthing.scm (syncthing)[synopsis]: Likewise.
(go-github-com-zillode-notify)[description]: Likewise.
* gnu/services/nfs.scm (pipefs-service-type): Likewise.
* guix/scripts/system.scm (perform-action): Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2016-10-12 19:26:10 +0200'>2016-10-12</span></td><td><a href='/guix/commit/gnu/services/nfs.scm?id=eb419bc9fe46358f750c5f0aed87a9b98a93609e'>gnu: Add NFS related services.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/nfs.scm (pipefs-service-type): New variable,
(gss-service-type): New variable, (idmap-service-type) New variable.

* doc/guix.texi (Network File System): New node.
</span></span></td><td>John Darrington</td></tr>
<tr><td><span title='2016-10-01 09:26:07 +0200'>2016-10-01</span></td><td><a href='/guix/commit/gnu/services/nfs.scm?id=43f7af428e139f64b9ec229eb74918e328a63a5a'>gnu: rpcbind-configuration: Rename pkg to nfs-utils</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/nfs.scm (&lt;rpcbind-configuration&gt;): "pkg" --&gt; "nfs-utils"
</span></span></td><td>John Darrington</td></tr>
<tr><td><span title='2016-09-07 20:26:11 +0200'>2016-09-07</span></td><td><a href='/guix/commit/gnu/services/nfs.scm?id=d6a07ee6751cdd414d702194dbeb0fd71f0781c9'>gnu: Add rpc-daemon service</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/nfs.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
</span></span></td><td>John Darrington</td></tr>