Do not unconditionally include search/xapian features

On Windows, if we declare a exported class, the implementation of this class is expected in the dll. When compiling without xapian we must not include headers for which we don't compile the implementation.
openzim · May 29, 2024 · 3dc8833 · 3dc8833
1 parent c930ed6
commit 3dc8833
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/writer/defaultIndexData.h b/src/writer/defaultIndexData.h
@@ -22,7 +22,10 @@
 
 #include <zim/writer/item.h>
 #include <zim/tools.h>
+
+#if defined(ENABLE_XAPIAN)
 #include "xapian/myhtmlparse.h"
+#endif
 #include "../tools.h"
 
 #include <atomic>

diff --git a/test/archive.cpp b/test/archive.cpp
@@ -21,7 +21,9 @@
 #include <zim/zim.h>
 #include <zim/archive.h>
 #include <zim/item.h>
+#if defined(ENABLE_XAPIAN)
 #include <zim/search.h>
+#endif
 #include <zim/suggestion.h>
 #include <zim/error.h>
 

diff --git a/test/indexing_criteria.cpp b/test/indexing_criteria.cpp
@@ -20,7 +20,9 @@
 #define ZIM_PRIVATE
 #include <zim/archive.h>
 #include <zim/item.h>
+#if defined(ENABLE_XAPIAN)
 #include <zim/search.h>
+#endif
 #include <zim/suggestion.h>
 #include <zim/writer/item.h>
 

diff --git a/test/tools.h b/test/tools.h
@@ -40,7 +40,6 @@ typedef SSIZE_T ssize_t;
 
 #define ZIM_PRIVATE
 #include <zim/archive.h>
-#include <zim/search.h>
 #include <zim/writer/creator.h>
 #include <zim/writer/item.h>
 #include <zim/writer/contentProvider.h>