From 428c7f36bd1eaa88c3e61a99dd7f2a2c84409f28 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 24 Oct 2011 15:46:03 -0700 Subject: cmake: restored extraction of git describe why was this removed? --- cmake/Modules/GrVersion.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 666c6f126..7baa8eabb 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -44,16 +44,16 @@ set(MAINT_VERSION ${VERSION_INFO_MAINT_VERSION}) ######################################################################## find_package(Git) -#if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) -# message(STATUS "Extracting version information from git describe...") -# execute_process( -# COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 -# OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE -# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -# ) -#else() -# set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown") -#endif() +if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) + message(STATUS "Extracting version information from git describe...") + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 + OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) +else() + set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown") +endif() ######################################################################## # Use the logic below to set the version constants -- cgit