summaryrefslogtreecommitdiff
path: root/utils/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'utils/rbutilqt')
-rw-r--r--utils/rbutilqt/CMakeLists.txt2
-rw-r--r--utils/rbutilqt/version.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index 138d0903cf..da453c3d11 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -122,7 +122,7 @@ if(APPLE)
122 PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 122 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
123endif() 123endif()
124 124
125target_link_libraries(RockboxUtility rbbase cutelogger 125target_link_libraries(RockboxUtility rbbase cutelogger gitversion
126 Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia) 126 Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia)
127 127
128target_include_directories(RockboxUtility PRIVATE 128target_include_directories(RockboxUtility PRIVATE
diff --git a/utils/rbutilqt/version.h b/utils/rbutilqt/version.h
index b2d24d369b..1a1d78f643 100644
--- a/utils/rbutilqt/version.h
+++ b/utils/rbutilqt/version.h
@@ -18,6 +18,8 @@
18 * 18 *
19 ****************************************************************************/ 19 ****************************************************************************/
20 20
21#include "gitversion.h"
22
21// PUREVERSION is needed to be able to just compare versions. It does not 23// PUREVERSION is needed to be able to just compare versions. It does not
22// contain a build timestamp because it needs to be the same in different 24// contain a build timestamp because it needs to be the same in different
23// files 25// files
@@ -38,7 +40,7 @@
38#define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c) 40#define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c)
39#define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID 41#define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID
40// PUREVERSION should identify the build uniquely. Use version string for now. 42// PUREVERSION should identify the build uniquely. Use version string for now.
41#define PUREVERSION "$Rev$" 43#define PUREVERSION GITHASH
42 44
43#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__ 45#define FULLVERSION VERSION " (" GITHASH "), built " __DATE__ " " __TIME__
44 46