Skip to content

Commit f90eed1

Browse files
committed
cmake: rename GIT to GITCOMMAND
1 parent 46adf1a commit f90eed1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -526,19 +526,19 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
526526
# create qgsversion.h
527527
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
528528
IF (GIT_MARKER)
529-
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
530-
IF(GIT)
529+
FIND_PROGRAM(GITCOMMAND git PATHS c:/cygwin/bin)
530+
IF(GITCOMMAND)
531531
IF(MSVC)
532532
ADD_CUSTOM_COMMAND(
533533
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
534-
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
534+
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
535535
MAIN_DEPENDENCY ${GIT_MARKER}
536536
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
537537
)
538538
ELSE(MSVC)
539539
EXECUTE_PROCESS(
540540
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
541-
COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION
541+
COMMAND ${GITCOMMAND} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION
542542
)
543543
STRING(STRIP "${REVISION}" REVISION)
544544
ADD_CUSTOM_COMMAND(
@@ -548,11 +548,11 @@ IF (GIT_MARKER)
548548
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
549549
)
550550
ENDIF(MSVC)
551-
ELSE(GIT)
551+
ELSE(GITCOMMAND)
552552
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
553553
SET(REVISION "unknown")
554554
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
555-
ENDIF(GIT)
555+
ENDIF(GITCOMMAND)
556556
ELSE (GIT_MARKER)
557557
SET(REVISION "exported")
558558
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")

0 commit comments

Comments
 (0)