diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:37:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:37:46 +0200 |
| commit | 9f177ce1906121bbc7c96372486fdce3d2926b76 (patch) | |
| tree | e2f45d4199c0846ad31c832248dcbd3872e19dbe | |
| parent | cd6315dfe30059dfbd25185fc7d57feb2bce5f24 (diff) | |
| parent | 2b143a2cea018f6c62800fcb931cc950853728c7 (diff) | |
Merge branch 'unstable' into trackhat-ui
* unstable:
un-bitrot installer support
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | installer/opentrack-installer.iss | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5974adef..b48ac0cf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ if(GIT_FOUND) git_describe(OPENTRACK__COMMIT --tags --always) endif() +file(WRITE ${CMAKE_BINARY_DIR}/opentrack-version.h "#define OPENTRACK_VERSION \"${OPENTRACK__COMMIT}\"") + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_SKIP_INSTALL_RPATH FALSE) diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index db8dc85e..345fda72 100755 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,8 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "TrackHat opentrack" -#define MyAppVersion "trackhat-1.1" +#include "../build/opentrack-version.h" +#define MyAppVersion OPENTRACK_VERSION #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" |