Merge pull request #540 from RyanGordon/cli_version

Adding in CLI -help and -version options

Author: floe

examples/Protonect.cpp

@@ -110,8 +110,9 @@ int main(int argc, char *argv[])
 /// [main]
 {
   std::string program_path(argv[0]);
+  std::cerr << "Version: " << LIBFREENECT2_VERSION << std::endl;
   std::cerr << "Environment variables: LOGFILE=<protonect.log>" << std::endl;
-  std::cerr << "Usage: " << program_path << " [gl | cl | cpu] [<device serial>] [-noviewer]" << std::endl;
+  std::cerr << "Usage: " << program_path << " [gl | cl | cpu] [<device serial>] [-noviewer] [-help] [-version]" << std::endl;
   std::cerr << "To pause and unpause: pkill -USR1 Protonect" << std::endl;
   size_t executable_name_idx = program_path.rfind("Protonect");
 
@@ -145,23 +146,20 @@ int main(int argc, char *argv[])
   libfreenect2::PacketPipeline *pipeline = 0;
 /// [context]
 
-/// [discovery]
-  if(freenect2.enumerateDevices() == 0)
-  {
-    std::cout << "no device connected!" << std::endl;
-    return -1;
-  }
-
-  std::string serial = freenect2.getDefaultDeviceSerialNumber();
-/// [discovery]
+  std::string serial = "";
 
   bool viewer_enabled = true;
 
   for(int argI = 1; argI < argc; ++argI)
   {
     const std::string arg(argv[argI]);
 
-    if(arg == "cpu")
+    if(arg == "-help" || arg == "--help" || arg == "-h" || arg == "-v" || arg == "--version" || arg == "-version")
+    {
+      // Just let the initial lines display at the beginning of main
+      return 0;
+    }
+    else if(arg == "cpu")
     {
       if(!pipeline)
 /// [pipeline]
@@ -190,7 +188,7 @@ int main(int argc, char *argv[])
     {
       serial = arg;
     }
-    else if(arg == "-noviewer")
+    else if(arg == "-noviewer" || arg == "--noviewer")
     {
       viewer_enabled = false;
     }
@@ -200,6 +198,19 @@ int main(int argc, char *argv[])
     }
   }
 
+/// [discovery]
+  if(freenect2.enumerateDevices() == 0)
+  {
+    std::cout << "no device connected!" << std::endl;
+    return -1;
+  }
+
+  if (serial == "")
+  {
+    serial = freenect2.getDefaultDeviceSerialNumber();
+  }
+/// [discovery]
+
   if(pipeline)
   {
 /// [open]

include/libfreenect2/config.h.in

@@ -27,6 +27,9 @@
 #ifndef LIBFREENECT2_CONFIG_H
 #define LIBFREENECT2_CONFIG_H
 
+#define LIBFREENECT2_VERSION "@PROJECT_VER@"
+#define LIBFREENECT2_API_VERSION ((@PROJECT_VER_MAJOR@ << 16) | @PROJECT_VER_MINOR@)
+
 #ifdef _MSC_VER
 #define LIBFREENECT2_PACK( __Declaration__ ) __pragma( pack(push, 1) ) __Declaration__ __pragma( pack(pop) )
 #else