From 43ec307781a979e991b5138744d214394df6c175 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Wed, 4 Apr 2018 11:39:55 +0200
Subject: [PATCH] Better message about optional test, warning suppression

---
 .appveyor.yml          | 2 ++
 .ci/make_and_test.sh   | 1 +
 CMakeLists.txt         | 2 +-
 include/CLI/Option.hpp | 2 +-
 tests/OptionalTest.cpp | 8 ++++++--
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 6329d24..816f16d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,7 +18,9 @@ build_script:
   - conan create . CLIUtils/CLI11
 
 test_script:
+  - cd build
   - ctest --output-on-failure -C Debug
+  - tests\OptionalTest
 
 notifications:
   - provider: Webhook
diff --git a/.ci/make_and_test.sh b/.ci/make_and_test.sh
index 2ba81ae..9d76a03 100755
--- a/.ci/make_and_test.sh
+++ b/.ci/make_and_test.sh
@@ -15,6 +15,7 @@ echo "Testing..."
 set -evx
 
 ctest --output-on-failure
+./tests/OptionalTest
 
 set +evx
 echo -en "travis_fold:end:script.test\\r"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de2f8ae..53c187c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     if(MSVC)
         add_definitions("/W4")
     else()
-        add_definitions(-Wall -Wextra -pedantic)
+        add_definitions(-Wall -Wextra -pedantic -Wno-deprecated-declarations)
     endif()
 
     if(CMAKE_VERSION VERSION_GREATER 3.6)
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 6985308..0cb1033 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -309,7 +309,7 @@ class Option : public OptionBase<Option> {
     template <typename T = App> Option *requires(std::string opt_name) {
         for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
             if(opt.get() != this && opt->check_name(opt_name))
-                return requires(opt.get());
+                return needs(opt.get());
         throw IncorrectConstruction::MissingOption(opt_name);
     }
 
diff --git a/tests/OptionalTest.cpp b/tests/OptionalTest.cpp
index a863f23..cbe036a 100644
--- a/tests/OptionalTest.cpp
+++ b/tests/OptionalTest.cpp
@@ -1,10 +1,10 @@
 #include <cstdlib>
 #include <iostream>
 
-#if CLI11_OPTIONAL
-
 #include "app_helper.hpp"
 
+#if CLI11_OPTIONAL
+
 TEST_F(TApp, OptionalTest) {
     optional<int> opt;
     app.add_option("-c,--count", opt);
@@ -24,4 +24,8 @@ TEST_F(TApp, OptionalTest) {
     EXPECT_EQ(*opt, 3);
 }
 
+#else
+
+TEST_F(TApp, DISABLED_OptionalTest) {}
+
 #endif
--
libgit2 0.21.4