simplify PR

Author: jsteemann

core/CMakeLists.txt

@@ -365,18 +365,13 @@ add_dependencies(iresearch-static
 target_include_directories(iresearch-static
   SYSTEM
   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+  PRIVATE ${ICU_INCLUDE_DIR}
   PRIVATE $<TARGET_PROPERTY:iresearch-ofst,INTERFACE_INCLUDE_DIRECTORIES>
   PUBLIC ${VPACK_INCLUDE_PATH}
   PUBLIC $<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>
   PUBLIC $<TARGET_PROPERTY:${FASTTEXT_LIBRARY_STATIC},INTERFACE_INCLUDE_DIRECTORIES>
   )
 
-target_include_directories(iresearch-static
-  SYSTEM
-  BEFORE
-  PRIVATE ${ICU_INCLUDE_DIR}
-)
-
 # setup MSVC specific compiler flags
 if (MSVC)
   target_compile_options(iresearch-static
@@ -496,13 +491,8 @@ set_ipo(iresearch-analyzer-text-static)
 
 target_include_directories(iresearch-analyzer-text-static
   SYSTEM
-  PRIVATE ${Snowball_INCLUDE_DIR}
-  )
-
-target_include_directories(iresearch-analyzer-text-static
-  SYSTEM
-  BEFORE
   PRIVATE ${ICU_INCLUDE_DIR} # cmake on MSVC does not properly expand dependencies for linked libraries
+  PRIVATE ${Snowball_INCLUDE_DIR}
   )
 
 set_target_properties(iresearch-analyzer-text-static
@@ -534,7 +524,6 @@ set_ipo(iresearch-analyzer-collation-static)
 
 target_include_directories(iresearch-analyzer-collation-static
   SYSTEM
-  BEFORE
   PRIVATE ${ICU_INCLUDE_DIR} # cmake on MSVC does not properly expand dependencies for linked libraries
   )
 
@@ -588,7 +577,6 @@ set_ipo(iresearch-analyzer-norm-static)
 
 target_include_directories(iresearch-analyzer-norm-static
   SYSTEM
-  BEFORE
   PRIVATE ${ICU_INCLUDE_DIR} # cmake on MSVC does not properly expand dependencies for linked libraries
   )
 
@@ -622,11 +610,6 @@ set_ipo(iresearch-analyzer-stem-static)
 target_include_directories(iresearch-analyzer-stem-static
   SYSTEM
   PRIVATE ${Snowball_INCLUDE_DIR}
-  )
-
-target_include_directories(iresearch-analyzer-stem-static
-  SYSTEM
-  BEFORE
   PRIVATE ${ICU_INCLUDE_DIR}
   )
 

core/analysis/collation_token_stream.cpp

@@ -68,7 +68,7 @@ bool locale_from_slice(VPackSlice slice, IRESEARCH_ICU_NAMESPACE::Locale& locale
     IRESEARCH_ICU_NAMESPACE::Collator::createInstance(locale, err)};
 
   if (!collator) {
-    IRS_LOG_WARN(absl::StrCat("Can't instantiate IRESEARCH_ICU_NAMESPACE::Collator from locale: ",
+    IRS_LOG_WARN(absl::StrCat("Can't instantiate icu::Collator from locale: ",
                               locale_name));
     return false;
   }
@@ -77,7 +77,7 @@ bool locale_from_slice(VPackSlice slice, IRESEARCH_ICU_NAMESPACE::Locale& locale
   if (err != UErrorCode::U_ZERO_ERROR) {
     IRS_LOG(
       U_FAILURE(err) ? log::Level::kWarn : log::Level::kTrace,
-      absl::StrCat("Failure while instantiation of IRESEARCH_ICU_NAMESPACE::Collator from locale: ",
+      absl::StrCat("Failure while instantiation of icu::Collator from locale: ",
                    locale_name, ", ", u_errorName(err)));
   }
 

core/analysis/text_token_stream.cpp

@@ -452,7 +452,7 @@ bool init_from_options(const analysis::text_token_stream::options_t& options,
 
     if (print_errors) {
       IRS_LOG_WARN(
-        absl::StrCat("Warning while instantiation IRESEARCH_ICU_NAMESPACE::Normalizer2 for "
+        absl::StrCat("Warning while instantiation icu::Normalizer2 for "
                      "text_token_stream from locale: ",
                      options.locale.getName(), ", ", u_errorName(err)));
     }
@@ -477,7 +477,7 @@ bool init_from_options(const analysis::text_token_stream::options_t& options,
 
       if (print_errors) {
         IRS_LOG_WARN(
-          absl::StrCat("Warning while instantiation IRESEARCH_ICU_NAMESPACE::Transliterator for "
+          absl::StrCat("Warning while instantiation icu::Transliterator for "
                        "text_token_stream from locale: ",
                        options.locale.getName(), ", ", u_errorName(err)));
       }
@@ -495,7 +495,7 @@ bool init_from_options(const analysis::text_token_stream::options_t& options,
 
     if (print_errors) {
       IRS_LOG_WARN(
-        absl::StrCat("Warning while instantiation IRESEARCH_ICU_NAMESPACE::BreakIterator for "
+        absl::StrCat("Warning while instantiation icu::BreakIterator for "
                      "text_token_stream from locale: ",
                      options.locale.getName(), ", ", u_errorName(err)));
     }