summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Config/swiften-config.cpp10
-rw-r--r--Swiften/SConscript1
2 files changed, 11 insertions, 0 deletions
diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp
index 0c46cf0..81a8357 100644
--- a/Swiften/Config/swiften-config.cpp
+++ b/Swiften/Config/swiften-config.cpp
@@ -16,6 +16,7 @@
#include <Swiften/Base/Platform.h>
#include <Swiften/Base/Paths.h>
+#include <Swiften/Version.h>
#include "swiften-config.h"
@@ -35,6 +36,7 @@ int main(int argc, char* argv[]) {
boost::program_options::options_description desc;
desc.add_options()
("help", "Show this help message")
+ ("version", "Show version information")
("libs", "List the library flags")
("cflags", "List the compiler & preprocessor flags")
;
@@ -56,9 +58,17 @@ int main(int argc, char* argv[]) {
}
if (vm.count("help") > 0) {
+ std::cout << "swiften-config outputs the Swiften build options." << std::endl;
+ std::cout << std::endl;
+ std::cout << "Usage: swiften-config [OPTIONS]..." << std::endl;
+ std::cout << std::endl;
std::cout << desc << "\n";
return 0;
}
+ if (vm.count("version") > 0) {
+ std::cout << "swiften-config " << SWIFTEN_VERSION_STRING << std::endl;
+ return 0;
+ }
// Read in all variables
std::vector<std::string> libs;
diff --git a/Swiften/SConscript b/Swiften/SConscript
index f8392a8..d98c9b7 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -394,6 +394,7 @@ if env["SCONS_STAGE"] == "build" :
version_header = "#pragma once\n\n"
version_header += "#define SWIFTEN_VERSION 0x%02X%02X%02X\n" % (swiften_env["SWIFTEN_VERSION_MAJOR"], swiften_env["SWIFTEN_VERSION_MINOR"], swiften_env["SWIFTEN_VERSION_PATCH"])
+ version_header += "#define SWIFTEN_VERSION_STRING \"%s\"\n" % swiften_env["SWIFTEN_VERSION"]
swiften_env.WriteVal("Version.h", swiften_env.Value(version_header))
swiften_includes.append("Swiften/Version.h")