Merge pull request #22 from sgerbino/enhancement-cpack-deployments

Fix for CMake version validation regex expression
sgerbino · Dec 23, 2015 · 70e4d98 · 70e4d98
2 parents 035d02f + 955c45c
commit 70e4d98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -4,7 +4,7 @@ execute_process(
   OUTPUT_VARIABLE TABLE_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9].*" TABLE_VALID_VERSION TABLE_VERSION)
+string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" TABLE_VALID_VERSION "${TABLE_VERSION}")
 if (TABLE_VALID_VERSION)
   string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" TABLE_MAJOR_VERSION "${TABLE_VERSION}")
   string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" TABLE_MINOR_VERSION "${TABLE_VERSION}")

diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
@@ -15,7 +15,7 @@ if(GIT_FOUND)
     OUTPUT_VARIABLE TABLE_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-  string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9].*" TABLE_VALID_VERSION TABLE_VERSION)
+  string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" TABLE_VALID_VERSION "${TABLE_VERSION}")
   if (TABLE_VALID_VERSION)
     string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" TABLE_MAJOR_VERSION "${TABLE_VERSION}")
     string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" TABLE_MINOR_VERSION "${TABLE_VERSION}")