From 8c5782b7a29f7d72cd81fa3bc270e4423c741033 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 21 Oct 2019 21:50:00 -0500 Subject: Use VERSTR for version instead of hardcoding --- CMakeLists.txt | 6 +++++- tools/hscript-simulate/simulator.cc | 2 +- tools/hscript-validate/validator.cc | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfa8791..95e82f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,13 @@ include(FindPkgConfig) include(CheckIncludeFiles) project(Horizon - LANGUAGES CXX + LANGUAGES C CXX VERSION 0.1.0) + +add_definitions(-DVERSTR="${PROJECT_VERSION}") + + option(BUILD_TOOLS "Enable building of tools (Validator, Simulator, etc)" ON) diff --git a/tools/hscript-simulate/simulator.cc b/tools/hscript-simulate/simulator.cc index 45bd7e6..3dd6175 100644 --- a/tools/hscript-simulate/simulator.cc +++ b/tools/hscript-simulate/simulator.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { } bold_if_pretty(std::cout); if(!isatty(1)) std::cout << "# Generated by "; - std::cout << "HorizonScript Simulation Utility version 0.1.0"; + std::cout << "HorizonScript Simulation Utility version " << VERSTR; #ifndef HAS_INSTALL_ENV std::cout << " (runtime environment only)"; #endif diff --git a/tools/hscript-validate/validator.cc b/tools/hscript-validate/validator.cc index e1dc784..521e8ee 100644 --- a/tools/hscript-validate/validator.cc +++ b/tools/hscript-validate/validator.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { } bold_if_pretty(std::cout); - std::cout << "HorizonScript Validation Utility version 0.1.0"; + std::cout << "HorizonScript Validation Utility version " << VERSTR; #ifndef HAS_INSTALL_ENV std::cout << " (runtime environment only)"; #endif -- cgit v1.2.3-60-g2f50