From: Milan Ševčík <majlen@civ.zcu.cz>
Date: Thu, 16 Mar 2017 13:06:49 +0000 (+0100)
Subject: Move GetLibraryVersion function to its own module file
X-Git-Tag: v1.2.0^2~98^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=623baf513e9331954ab76c44eabe63881476969a;p=thirdparty%2Fzstd.git

Move GetLibraryVersion function to its own module file
---

diff --git a/build/cmake/CMakeModules/GetLibraryVersion.cmake b/build/cmake/CMakeModules/GetLibraryVersion.cmake
new file mode 100644
index 000000000..a3e2fd25f
--- /dev/null
+++ b/build/cmake/CMakeModules/GetLibraryVersion.cmake
@@ -0,0 +1,9 @@
+function(GetLibraryVersion _header _major _minor _release)
+    # Read file content
+    FILE(READ ${_header} CONTENT)
+
+    string(REGEX MATCHALL ".*define ZSTD_VERSION_MAJOR+.* ([0-9]+).*define ZSTD_VERSION_MINOR+.* ([0-9]+).*define ZSTD_VERSION_RELEASE+.* ([0-9]+)" VERSION_REGEX "${CONTENT}")
+    SET(${_major} ${CMAKE_MATCH_1} PARENT_SCOPE)
+    SET(${_minor} ${CMAKE_MATCH_2} PARENT_SCOPE)
+    SET(${_release} ${CMAKE_MATCH_3} PARENT_SCOPE)
+endfunction()
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index ffb6bd4a3..ed5b36b21 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -10,15 +10,8 @@
 #  - zstd homepage : http://www.zstd.net/
 # ################################################################
 
-# Get library version based on information from input content (use regular exp)
-function(GetLibraryVersion _content _outputVar1 _outputVar2 _outputVar3)
-    string(REGEX MATCHALL ".*define ZSTD_VERSION_MAJOR+.* ([0-9]+).*define ZSTD_VERSION_MINOR+.* ([0-9]+).*define ZSTD_VERSION_RELEASE+.* ([0-9]+)" VERSION_REGEX "${_content}")
-    SET(${_outputVar1} ${CMAKE_MATCH_1} PARENT_SCOPE)
-    SET(${_outputVar2} ${CMAKE_MATCH_2} PARENT_SCOPE)
-    SET(${_outputVar3} ${CMAKE_MATCH_3} PARENT_SCOPE)
-endfunction()
-
 PROJECT(libzstd)
+INCLUDE(${CMAKE_SOURCE_DIR}/CMakeModules/GetLibraryVersion.cmake)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
@@ -26,11 +19,8 @@ SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 SET(LIBRARY_DIR ${ZSTD_SOURCE_DIR}/lib)
 INCLUDE_DIRECTORIES(${LIBRARY_DIR} ${LIBRARY_DIR}/common)
 
-# Read file content
-FILE(READ ${LIBRARY_DIR}/zstd.h HEADER_CONTENT)
-
 # Parse version
-GetLibraryVersion("${HEADER_CONTENT}" LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE)
+GetLibraryVersion(${LIBRARY_DIR}/zstd.h LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE)
 MESSAGE("ZSTD VERSION ${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}")
 
 SET(Sources