From 881ebe59c5593d6c5dab89250a4a433d14c688f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20=C3=98stergaard?= Date: Thu, 15 Sep 2016 07:43:12 +0200 Subject: [PATCH] Remove now obsolete bzr check --- CMakeModules/WriteVersionHeader.cmake | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/CMakeModules/WriteVersionHeader.cmake b/CMakeModules/WriteVersionHeader.cmake index da1b9a4168..fa10f23362 100644 --- a/CMakeModules/WriteVersionHeader.cmake +++ b/CMakeModules/WriteVersionHeader.cmake @@ -22,20 +22,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # -# Automagically create version header file if the version string was not defined during -# the build configuration. If CreateBzrVersionHeader or CreateGitVersionHeader cannot -# determine the current repo version, a version.h file is still created with -# KICAD_BUILD_VERSION set to "no-vcs-found". +# Automagically create version header file if the version string was +# not defined during the build configuration. If +# CreateGitVersionHeader cannot determine the current repo version, a +# version.h file is still created with KICAD_BUILD_VERSION set to +# "no-vcs-found". if( NOT KICAD_BUILD_VERSION ) set( _wvh_version_str "no-vcs-found" ) - # Detect the appropiate VCS and set the version string. - if( EXISTS "${SRC_PATH}/.bzr" ) - message( STATUS "Using Bazaar to determine build version string." ) - include( ${CMAKE_MODULE_PATH}/CreateBzrVersionHeader.cmake ) - create_bzr_version_header( ${SRC_PATH} ) - set( _wvh_version_str ${KICAD_BUILD_VERSION} ) - elseif( EXISTS "${SRC_PATH}/.git" ) + # Attempt to detect if we have a git repo and set the version string. + if( EXISTS "${SRC_PATH}/.git" ) message( STATUS "Using Git to determine build version string." ) include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake ) create_git_version_header( ${SRC_PATH} )