fix Unicode build

Jarryd Beck
1 parent d92988c6
Showing 3 changed files with 18 additions and 1 deletions
src/CMakeLists.txt
src/cxxopts.hpp
test/CMakeLists.txt
@@ -21,6 +21,8 @@
 if(CXXOPTS_BUILD_EXAMPLES)
     add_executable(example example.cpp cxxopts.hpp)
  
+    target_link_libraries(example ${CXXOPTS_LINKER_LIBRARIES})
+
     if (MSVC)
         target_compile_options(example PUBLIC /W2)
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -156,6 +156,13 @@ namespace cxxopts
  
     return result;
   }
+
+  inline
+  bool
+  empty(const String& s)
+  {
+    return s.isEmpty();
+  }
 }
  
 namespace std
@@ -222,6 +229,12 @@ namespace cxxopts
     return std::forward<T>(t);
   }
  
+  inline
+  bool
+  empty(const std::string& s)
+  {
+    return s.empty();
+  }
 }
  
 //ifdef CXXOPTS_USE_UNICODE
@@ -1364,7 +1377,7 @@ Options::help(const std::vector&lt;std::string&gt;&amp; groups) const
   for (std::size_t i = 0; i < groups.size(); ++i)
   {
     String const& group_help = help_one_group(groups[i]);
-    if (group_help.empty()) continue;
+    if (empty(group_help)) continue;
     result += group_help;
     if (i < groups.size() - 1)
     {
 if (CXXOPTS_BUILD_TESTS)
     add_executable(options_test options.cpp)
  
+    target_link_libraries(options_test ${CXXOPTS_LINKER_LIBRARIES})
+
     if (MSVC)
         target_compile_options(options_test PUBLIC /W2)
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")