Merge branch 'master' of github.com:stixpjr/cpu_check

stixpjr · Nov 16, 2018 · 14c438e · 14c438e
2 parents e1794d5 + 7c208d4
commit 14c438e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config.h.in b/config.h.in
@@ -1 +1 @@
-#define cpu_check_VERSION @cpu_check_VERSION@
+#define cpu_check_VERSION "@cpu_check_VERSION@"
diff --git a/cpu_check.cc b/cpu_check.cc
@@ -566,7 +566,7 @@ void Worker::Run() {
 }
 
 int main(int argc, char **argv) {
-  LOG(INFO) << "Starting " << argv[0];
+  LOG(INFO) << "Starting " << argv[0] << " version " cpu_check_VERSION;
   std::vector<std::thread *> tids;
   std::vector<Worker *> workers;
   std::vector<std::string> words = ReadDict();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define cpu_check_VERSION @cpu_check_VERSION@
		#define cpu_check_VERSION "@cpu_check_VERSION@"