Skip to content

Commit 76751f6

Browse files
telwertowskijef-n
authored andcommittedMay 11, 2011
Mac Info.plist svn=>git
1 parent 3ffc255 commit 76751f6

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed
 

‎src/mac/Contents/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
SET(COMPLETE_VERSION_WITH_RELEASE_NAME \"${COMPLETE_VERSION}-${RELEASE_NAME}\")
66
7-
IF (NOT EXISTS SVN_MARKER)
8-
SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file
9-
ENDIF (NOT EXISTS SVN_MARKER)
7+
IF (NOT EXISTS GIT_MARKER)
8+
SET (GIT_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file
9+
ENDIF (NOT EXISTS GIT_MARKER)
1010
1111
ADD_CUSTOM_TARGET(Info.plist ALL
12-
DEPENDS ${SVN_MARKER}
12+
DEPENDS ${GIT_MARKER}
1313
COMMAND ${CMAKE_COMMAND}
1414
-D CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
1515
-D SOURCE_DIR=${CMAKE_SOURCE_DIR}

‎src/mac/Contents/Info.plist.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
SET(CMAKE_BACKWARDS_COMPATIBILITY "2.4")
22

3-
# See if we have svn installed
4-
FIND_PROGRAM(SVNVERSION svnversion)
3+
# See if we have git installed
4+
FIND_PROGRAM (GIT git)
55

66
# Read the revision if installed, else set to "unknown"
7-
IF (SVNVERSION)
8-
EXEC_PROGRAM (${SVNVERSION} ARGS ${SOURCE_DIR} OUTPUT_VARIABLE REVISION)
9-
ELSE (SVNVERSION)
7+
IF (GIT)
8+
EXEC_PROGRAM (${GIT} ${SOURCE_DIR} ARGS "log -n1 --pretty=%h" OUTPUT_VARIABLE REVISION)
9+
ELSE (GIT)
1010
SET (REVISION unknown)
11-
ENDIF (SVNVERSION)
11+
ENDIF (GIT)
1212

1313
# Create Info.plist
1414
CONFIGURE_FILE (${CURRENT_SOURCE_DIR}/Info.plist.in

‎src/mac/Contents/Info.plist.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundleSignature</key>
1616
<string>QGIS</string>
1717
<key>CFBundleGetInfoString</key>
18-
<string>QGIS @VERSION@ (@REVISION@), © 2002-2010 QGIS Development Team</string>
18+
<string>QGIS @VERSION@ (@REVISION@), © 2002-2011 QGIS Development Team</string>
1919
<key>CFBundleShortVersionString</key>
2020
<string>@VERSION_NUM@</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)
Please sign in to comment.