bugfix: git porcelain

Author: scivision

CMakeLists.txt

@@ -7,7 +7,7 @@ endif()
 project(Fortran2018Examples
 LANGUAGES C Fortran
 DESCRIPTION "Example of using modern Fortran syntax"
-VERSION 1.2.3)
+VERSION 1.3.1)
 
 enable_testing()
 

git/CMakeLists.txt

@@ -8,12 +8,12 @@ OUTPUT_VARIABLE git_branch OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
 OUTPUT_VARIABLE git_rev OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-execute_process(COMMAND ${GIT_EXECUTABLE} status --porcelain
-OUTPUT_VARIABLE git_porcelain OUTPUT_STRIP_TRAILING_WHITESPACE)
 set(git_porcelain .true.)
-if(git_porcelain)
+execute_process(COMMAND ${GIT_EXECUTABLE} status --porcelain
+OUTPUT_VARIABLE _porcelain OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(_porcelain)
   set(git_porcelain .false.)
-endif(git_porcelain)
+endif(_porcelain)
 else()
 set(git_branch)
 set(git_rev)

git/main.in.f90

@@ -10,7 +10,7 @@ program git_demo
 rev = "@git_rev@"
 porcelain = @git_porcelain@
 
-print *, "MyProgram  git_version:", git_version, " git_branch: ", branch, " git revision: ", rev, 'git_porcelain', porcelain
+print *, "MyProgram  git_version:", git_version, " git_branch: ", branch, " git revision: ", rev, ' git_porcelain', porcelain
 !! could also use this to set a warning or other logical flag
 
 end program

meson.build

@@ -1,5 +1,5 @@
 project('Fortran2018examples', 'fortran', 'c',
-  version : '1.2.3',
+  version : '1.3.1',
   meson_version: '>= 0.52.0',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])