From 4cabaf0c4b18e463248f17d9ea0711da4212f462 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 7 Jul 2019 12:11:16 +0200
Subject: [PATCH] Use Go modules for building libsyncthing

Requires Go 1.11 or later
---
 .gitignore                  | 8 ++++----
 libsyncthing/CMakeLists.txt | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04bcd9f..643ad35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,6 @@
 *.dylib
 
 # Qt-es
-
 /.qmake.cache
 /.qmake.stash
 *.pro.user
@@ -27,13 +25,15 @@ Makefile*
 *-build-*
 
 # QtCreator
-
 *.autosave
 
-#QtCtreator Qml
+# QtCtreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 
+# Go modules
+/libsyncthing/go/pkg
+
 # Dolphin
 .directory
 
diff --git a/libsyncthing/CMakeLists.txt b/libsyncthing/CMakeLists.txt
index e5d156b..d0f6396 100644
--- a/libsyncthing/CMakeLists.txt
+++ b/libsyncthing/CMakeLists.txt
@@ -91,6 +91,7 @@ message(STATUS "Syncthing's go files: ${SRC_FILES_SYNCTHING}")
 # generate Syncthing's assets: don't set GOARCH/GOOS here, this is supposed to run on the host
 add_custom_command(OUTPUT "${SYNCTHING_PATH}/lib/auto/gui.files.go"
                    COMMAND "GOPATH=${GO_DEVELOPMENT_PATH}"
+                           "GO111MODULE=on"
                            "${GO_BIN}"
                            run
                            ./script/genassets.go
@@ -110,6 +111,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsyncthinginternal.a"
                            "GOOS=${GO_TARGET_OS}"
                            "GOARCH=${GO_TARGET_ARCH}"
                            "CGO_ENABLED=1"
+                           "GO111MODULE=on"
                            "GOPATH=${GO_DEVELOPMENT_PATH}"
                            "${GO_BIN}"
                            build