@@ -119,39 +119,41 @@ else(CLEMENTINE_VERSION_PRERELEASE)
119119endif (CLEMENTINE_VERSION_PRERELEASE )
120120
121121# Add git revision
122- if (FORCE_GIT_REVISION)
123- set (GIT_REV ${FORCE_GIT_REVISION} )
124- set (GIT_INFO_RESULT 0)
125- else (FORCE_GIT_REVISION )
126- find_program (GIT_EXECUTABLE git )
127- message (STATUS "Found git: ${GIT_EXECUTABLE} " )
128-
129- if (NOT GIT_EXECUTABLE-NOTFOUND)
130- execute_process (COMMAND ${GIT_EXECUTABLE} describe
131- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
132- RESULT_VARIABLE GIT_INFO_RESULT
133- OUTPUT_VARIABLE GIT_REV
134- OUTPUT_STRIP_TRAILING_WHITESPACE )
135- if (NOT ${GIT_INFO_RESULT} EQUAL 0)
136- message (SEND_ERROR "git describe failed with code ${GIT_INFO_RESULT} : ${GIT_REV} " )
122+ if (INCLUDE_GIT_REVISION)
123+ if (FORCE_GIT_REVISION)
124+ set (GIT_REV ${FORCE_GIT_REVISION} )
125+ set (GIT_INFO_RESULT 0)
126+ else (FORCE_GIT_REVISION )
127+ find_program (GIT_EXECUTABLE git )
128+ message (STATUS "Found git: ${GIT_EXECUTABLE} " )
129+
130+ if (NOT GIT_EXECUTABLE-NOTFOUND)
131+ execute_process (COMMAND ${GIT_EXECUTABLE} describe
132+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
133+ RESULT_VARIABLE GIT_INFO_RESULT
134+ OUTPUT_VARIABLE GIT_REV
135+ OUTPUT_STRIP_TRAILING_WHITESPACE )
136+ if (NOT ${GIT_INFO_RESULT} EQUAL 0)
137+ message (SEND_ERROR "git describe failed with code ${GIT_INFO_RESULT} : ${GIT_REV} " )
138+ endif ()
137139 endif ()
138140 endif ()
139- endif ()
140141
141- string (REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\ 1;\\ 2;\\ 3"
142- GIT_PARTS ${GIT_REV} )
142+ string (REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\ 1;\\ 2;\\ 3"
143+ GIT_PARTS ${GIT_REV} )
143144
144- if (NOT GIT_PARTS)
145- message (FATAL_ERROR "Failed to parse git revision string '${GIT_REV} '" )
146- endif (NOT GIT_PARTS )
145+ if (NOT GIT_PARTS)
146+ message (FATAL_ERROR "Failed to parse git revision string '${GIT_REV} '" )
147+ endif (NOT GIT_PARTS )
147148
148- list (LENGTH GIT_PARTS GIT_PARTS_LENGTH)
149- if (GIT_PARTS_LENGTH EQUAL 3)
150- list (GET GIT_PARTS 0 GIT_TAGNAME)
151- list (GET GIT_PARTS 1 GIT_COMMITCOUNT)
152- list (GET GIT_PARTS 2 GIT_SHA1)
153- set (HAS_GIT_REVISION ON )
154- endif (GIT_PARTS_LENGTH EQUAL 3 )
149+ list (LENGTH GIT_PARTS GIT_PARTS_LENGTH)
150+ if (GIT_PARTS_LENGTH EQUAL 3)
151+ list (GET GIT_PARTS 0 GIT_TAGNAME)
152+ list (GET GIT_PARTS 1 GIT_COMMITCOUNT)
153+ list (GET GIT_PARTS 2 GIT_SHA1)
154+ set (HAS_GIT_REVISION ON )
155+ endif (GIT_PARTS_LENGTH EQUAL 3 )
156+ endif ()
155157
156158if (INCLUDE_GIT_REVISION AND HAS_GIT_REVISION)
157159 set (CLEMENTINE_VERSION_DISPLAY "${GIT_REV} " )
0 commit comments