File tree 4 files changed +18
-10
lines changed
4 files changed +18
-10
lines changed Original file line number Diff line number Diff line change @@ -767,14 +767,18 @@ IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
767
767
ENDIF (WIN32 )
768
768
ELSE (GITCOMMAND)
769
769
MESSAGE (STATUS "git marker, but no git found - version will be unknown" )
770
- SET (REVISION "unknown" )
771
- FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.h "#define QGSVERSION \" unknown\" " )
772
- FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.inc "${COMPLETE_VERSION} -${RELEASE_NAME} " )
770
+ IF (NOT SHA)
771
+ SET (SHA "unknown" )
772
+ ENDIF (NOT SHA)
773
+ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.h "#define QGSVERSION \" ${SHA} \"\n " )
774
+ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.inc "PROJECT_NUMBER = \" ${COMPLETE_VERSION} -${RELEASE_NAME} (${SHA} )\"\n " )
773
775
ENDIF (GITCOMMAND)
774
776
ELSE (EXISTS ${CMAKE_SOURCE_DIR} /.git/index)
775
- SET (REVISION "exported" )
776
- FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.h "#define QGSVERSION \" exported\" " )
777
- FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.inc "${COMPLETE_VERSION} -${RELEASE_NAME} " )
777
+ IF (NOT SHA)
778
+ SET (SHA "exported" )
779
+ ENDIF (NOT SHA)
780
+ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.h "#define QGSVERSION \" ${SHA} \"\n " )
781
+ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.inc "PROJECT_NUMBER = \" ${COMPLETE_VERSION} -${RELEASE_NAME} (${SHA} )\"\n " )
778
782
ENDIF (EXISTS ${CMAKE_SOURCE_DIR} /.git/index)
779
783
780
784
ADD_CUSTOM_TARGET (version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR} /qgsversion.h)
Original file line number Diff line number Diff line change @@ -77,6 +77,10 @@ CMAKE_OPTS := \
77
77
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
78
78
-DQT_DOC_URL=/usr/share/qt4/doc/html/
79
79
80
+ ifneq ($(SHA ) ,)
81
+ CMAKE_OPTS += -DSHA=$(SHA)
82
+ endif
83
+
80
84
ifeq ($(GRASSVER ) ,7)
81
85
CMAKE_OPTS += \
82
86
-DWITH_GRASS=TRUE \
Original file line number Diff line number Diff line change 15
15
<key >CFBundleSignature</key >
16
16
<string >QGIS</string >
17
17
<key >CFBundleGetInfoString</key >
18
- <string >${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION }), © 2002-2015 QGIS Development Team</string >
18
+ <string >${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA }), © 2002-2016 QGIS Development Team</string >
19
19
<key >CFBundleShortVersionString</key >
20
20
<string >${COMPLETE_VERSION}</string >
21
21
<key >CFBundleVersion</key >
22
- <string >${COMPLETE_VERSION} (${REVISION })</string >
22
+ <string >${COMPLETE_VERSION} (${SHA })</string >
23
23
<key >CFBundleIconFile</key >
24
24
<string >qgis.icns</string >
25
25
<key >CFBundleInfoDictionaryVersion</key >
Original file line number Diff line number Diff line change 15
15
<key >CFBundleSignature</key >
16
16
<string >QGSB</string >
17
17
<key >CFBundleGetInfoString</key >
18
- <string >${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION }), © 2002-2015 QGIS Development Team</string >
18
+ <string >${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA }), © 2002-2016 QGIS Development Team</string >
19
19
<key >CFBundleShortVersionString</key >
20
20
<string >${COMPLETE_VERSION}</string >
21
21
<key >CFBundleVersion</key >
22
- <string >${COMPLETE_VERSION} (${REVISION })</string >
22
+ <string >${COMPLETE_VERSION} (${SHA })</string >
23
23
<key >CFBundleIconFile</key >
24
24
<string >qgisb.icns</string >
25
25
<key >CFBundleInfoDictionaryVersion</key >
You can’t perform that action at this time.
0 commit comments