Removed depenency on boost program_options (replaced with cxxopts, which only depends on C++11).

glynos · glynos · commit a7d48af2d972 · 2016-01-30T17:10:29.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "libs/network/doc/_ext/breathe"]
 	path = libs/network/doc/_ext/breathe
 	url = https://github.com/michaeljones/breathe.git
+[submodule "deps/cxxopts"]
+	path = deps/cxxopts
+	url = https://github.com/jarro2783/cxxopts.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,8 +46,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
 # Always use multi-threaded Boost libraries.
 set(Boost_USE_MULTI_THREADED ON)
 
-find_package(Boost 1.57.0
-  REQUIRED system filesystem program_options)
+find_package(Boost 1.57.0 REQUIRED system filesystem)
 
 if (CPP-NETLIB_ENABLE_HTTPS)
     find_package( OpenSSL )
diff --git a/deps/cxxopts b/deps/cxxopts
@@ -0,0 +1 @@
+Subproject commit aec97a6f53c3486fc51e0d9857f10b683180d668
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -4,6 +4,7 @@
 #          http://www.boost.org/LICENSE_1_0.txt)
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
+include_directories(${CPP-NETLIB_SOURCE_DIR}/deps/cxxopts/src)
 if (OPENSSL_FOUND)
   include_directories(${OPENSSL_INCLUDE_DIR})
 endif (OPENSSL_FOUND)
diff --git a/libs/network/example/http_client.cpp b/libs/network/example/http_client.cpp
@@ -15,48 +15,36 @@
 #include <string>
 #include <utility>
 #include <iostream>
-
-namespace po = boost::program_options;
+#include "cxxopts.hpp"
 
 int main(int argc, char* argv[]) {
   using namespace boost::network;
-  po::options_description options("Allowed options");
-  std::string output_filename, source;
-  bool show_headers;
-  options.add_options()("help,h", "produce help message")(
-      "headers,H", "print headers")("status,S", "print status and message")(
-      "source,s", po::value<std::string>(&source), "source URL");
 
-  po::positional_options_description positional_options;
-  positional_options.add("source", 1);
-  po::variables_map vm;
-  try {
-    po::store(po::command_line_parser(argc, argv)
-                  .options(options)
-                  .positional(positional_options)
-                  .run(),
-              vm);
-    po::notify(vm);
-  }
-  catch (std::exception& e) {
-    std::cout << "Error: " << e.what() << std::endl;
-    std::cout << options << std::endl;
-    return EXIT_FAILURE;
-  }
+  cxxopts::Options options(argv[0], "Allowed options");
+  options.add_options()
+    ("h,help", "produce help message")
+    ("H,headers", "print headers")
+    ("S,status", "print status and message")
+    ("s,source", "source URL", cxxopts::value<std::string>())
+    ;
+
+  options.parse_positional(std::vector<std::string>{"source"});
+  options.parse(argc, argv);
 
-  if (vm.count("help")) {
-    std::cout << options << std::endl;
+  if (options.count("help")) {
+    std::cout << options.help({"", "Group"}) << std::endl;
     return EXIT_SUCCESS;
   }
 
-  if (vm.count("source") < 1) {
+  if (options.count("source") < 1) {
     std::cout << "Error: Source URL required." << std::endl;
-    std::cout << options << std::endl;
+    std::cout << options.help({"", "Group"}) << std::endl;
     return EXIT_FAILURE;
   }
 
-  show_headers = vm.count("headers") ? true : false;
-  bool show_status = vm.count("status") ? true : false;
+  std::string source = options["source"].as<std::string>();
+  bool show_headers = options.count("headers") ? true : false;
+  bool show_status = options.count("status") ? true : false;
 
   http::client::request request(source);
   http::client::string_type destination_ = host(request);
