From 1924feacb027c4e3bd0cac742ff37e0a94627062 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Wed, 25 Mar 2020 16:24:37 +0100
Subject: [PATCH] CMakeModules/libeoskeygen.cmake: define fromGit macro and use
 it.

---
 CMakeModules/libeoskeygen.cmake | 35 ++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/CMakeModules/libeoskeygen.cmake b/CMakeModules/libeoskeygen.cmake
index 9edbef7..4a8e19d 100644
--- a/CMakeModules/libeoskeygen.cmake
+++ b/CMakeModules/libeoskeygen.cmake
@@ -1,4 +1,26 @@
 
+# --------------------------------
+#  Variables
+# --------------------------------
+set( LIBEOSKEYGEN_GIT_URL "https://github.com/eosswedenorg/libeoskeygen.git" )
+set( LIBEOSKEYGEN_WANTED_VERSION 0.1.0 )
+
+# --------------------------------
+#  Macros
+# --------------------------------
+macro(fromGit tag)
+
+	message ("Using libeoskeygen from: ${LIBEOSKEYGEN_GIT_URL}@${tag}")
+
+	include(FetchContent)
+	FetchContent_Declare(libeoskeygen
+		GIT_REPOSITORY ${LIBEOSKEYGEN_GIT_URL}
+		GIT_TAG        ${tag}
+	)
+
+	FetchContent_MakeAvailable(libeoskeygen)
+endmacro()
+
 # If we have a custom libeoskeygen
 if(CUSTOM_LIBEOSKEYGEN)
 
@@ -8,24 +30,13 @@ if(CUSTOM_LIBEOSKEYGEN)
 	include(${CUSTOM_LIBEOSKEYGEN}/libeoskeygenTargets.cmake)
 else()
 
-	set( LIBEOSKEYGEN_WANTED_VERSION 0.1.0 )
-
 	# Try finding the package on the system.
 	find_package(libeoskeygen ${LIBEOSKEYGEN_WANTED_VERSION} QUIET)
 	if (libeoskeygen_FOUND)
 		message ("Using libeoskeygen in: ${libeoskeygen_DIR}")
 	# Not found, download from git.
 	else()
-		message ("Using libeoskeygen from: https://github.com/eosswedenorg/libeoskeygen.git@v${LIBEOSKEYGEN_WANTED_VERSION}")
-
-		include(FetchContent)
-		FetchContent_Declare(
-			libeoskeygen
-			GIT_REPOSITORY https://github.com/eosswedenorg/libeoskeygen.git
-			GIT_TAG        v${LIBEOSKEYGEN_WANTED_VERSION}
-		)
-
-		FetchContent_MakeAvailable(libeoskeygen)
+		fromGit( v${LIBEOSKEYGEN_WANTED_VERSION} )
 	endif()
 
 endif()