From 3747d952b269ec2b15b43f674d103851c54f66ca Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 28 Jul 2019 21:39:30 +0200
Subject: Fixed two compilation issues

---
 CMakeLists.txt                  | 5 +++++
 addon/doxysearch/doxysearch.cpp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69ed660..6941868 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,11 @@ if (use_libclang)
     endif()
 endif()
 
+# use C++11 standard for compiling (libclang option requires it)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 if (CMAKE_SYSTEM MATCHES "Darwin")
     set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_C_FLAGS}")
diff --git a/addon/doxysearch/doxysearch.cpp b/addon/doxysearch/doxysearch.cpp
index ac5740b..98adab4 100644
--- a/addon/doxysearch/doxysearch.cpp
+++ b/addon/doxysearch/doxysearch.cpp
@@ -374,7 +374,11 @@ int main(int argc,char **argv)
     parser.set_default_op(Xapian::Query::OP_AND);
     parser.set_stemming_strategy(Xapian::QueryParser::STEM_ALL);
     Xapian::termcount max_expansion=100;
+#if (XAPIAN_MAJOR_VERSION==1) && (XAPIAN_MINOR_VERSION==2)
+    parser.set_max_wildcard_expansion(max_expansion);
+#else
     parser.set_max_expansion(max_expansion,Xapian::Query::WILDCARD_LIMIT_MOST_FREQUENT);
+#endif
     Xapian::Query query=parser.parse_query(searchFor,
                                            Xapian::QueryParser::FLAG_DEFAULT  |
                                            Xapian::QueryParser::FLAG_WILDCARD |
-- 
cgit v0.12