From 984a4e3a9718cdac4f11bc9c76d77dfb90cbbd2e Mon Sep 17 00:00:00 2001 From: Rogier Date: Mon, 16 May 2016 08:56:32 +0200 Subject: [PATCH] Rename the file 'version' to 'base-version' This better reflects its purpose Also removed a redundant check for existence of the file in CMakeLists.txt In preparation for MSVC compilation support --- CMakeLists.txt | 10 +++------- version => base-version | 0 2 files changed, 3 insertions(+), 7 deletions(-) rename version => base-version (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d2df58..61057e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,13 +13,9 @@ endif(WIN32) # Obtain stored major version number # Make sure cmake is rerun when version has changed -configure_file(version version.dup COPYONLY) -file(REMOVE version.dup) -if(EXISTS "${CMAKE_HOME_DIRECTORY}/version") - file(STRINGS "${CMAKE_HOME_DIRECTORY}/version" VERSION_FROM_FILE) -else(EXISTS "${CMAKE_HOME_DIRECTORY}/version") - message(FATAL_ERROR "File '${CMAKE_HOME_DIRECTORY}/version' not found or not readable") -endif(EXISTS "${CMAKE_HOME_DIRECTORY}/version") +configure_file(base-version base-version.dup COPYONLY) +file(REMOVE base-version.dup) +file(STRINGS "${CMAKE_HOME_DIRECTORY}/base-version" VERSION_FROM_FILE) execute_process(COMMAND git describe --long "--match=[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]" --dirty=-WIP --abbrev=8 RESULT_VARIABLE VERSION_EXIT OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/version b/base-version similarity index 100% rename from version rename to base-version