From 4f595ff92e0ea53e7a23bf123704cf7024aa31db Mon Sep 17 00:00:00 2001 From: mdiluzio Date: Sat, 20 Dec 2014 17:27:25 +0000 Subject: [PATCH] Fix #8 by defining the version properly and adding a proper line end --- source/CMakeLists.txt | 3 +-- source/ttrts/main.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 2f3021c..b65975c 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required( VERSION 2.8.7 ) set( TTRTS_VERSION_MAJOR 0 ) set( TTRTS_VERSION_MINOR 0 ) set( TTRTS_VERSION_PATCH 1 ) -set( TTRTS_VERSION_STRING "${TTRTS_VERSION_MAJOR}.${TTRTS_VERSION_MINOR}.${TTRTS_VERSION_PATCH}") # Use c++1y (14) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++1y" ) @@ -25,7 +24,7 @@ add_definitions( -DTTRTS_VERSION_MAJOR=${TTRTS_VERSION_MAJOR} -DTTRTS_VERSION_MINOR=${TTRTS_VERSION_MINOR} -DTTRTS_VERSION_PATCH=${TTRTS_VERSION_PATCH} - -DTTRTS_VERSION_STRING=\"${DTTRTS_VERSION_STRING}\" + -DTTRTS_VERSION_STRING=\"${TTRTS_VERSION_MAJOR}.${TTRTS_VERSION_MINOR}.${TTRTS_VERSION_PATCH}\" ) diff --git a/source/ttrts/main.cpp b/source/ttrts/main.cpp index abc457b..16815f1 100644 --- a/source/ttrts/main.cpp +++ b/source/ttrts/main.cpp @@ -46,7 +46,7 @@ bool OutputGameStateFile(CTTRTSGame &game, std::string &gameDir) // Append the version number turnDescriptor = std::string("==== ttrts v") + sk_ttrts_version_string - + std::string(" ====") + + std::string(" ====\n") + turnDescriptor; turnFile<