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/etc/copyright.el?id=1305fc004a7d150f3dc6647343d9d8f0d3bc4652'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/copyright.el'>
<input type='hidden' name='id' value='1305fc004a7d150f3dc6647343d9d8f0d3bc4652'/><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=1305fc004a7d150f3dc6647343d9d8f0d3bc4652'>root</a>/<a href='/guix/log/etc?id=1305fc004a7d150f3dc6647343d9d8f0d3bc4652'>etc</a>/<a href='/guix/log/etc/copyright.el?id=1305fc004a7d150f3dc6647343d9d8f0d3bc4652'>copyright.el</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/etc/copyright.el?id=1305fc004a7d150f3dc6647343d9d8f0d3bc4652&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-22 17:56:31 +0300'>2020-02-22</span></td><td><a href='/guix/commit/etc/copyright.el?id=9a3971143854bf877c0739fc8fdf7b945a2e3935'>etc: Add copyright.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/copyright.el: New file.
* doc/contributing.texi (The Perfect Setup): Document this.
</span></span></td><td>Oleg Pykhalov</td></tr>