fixed test error when using external absl. uses add_compile_definitions in cmake

Author: taku910

src/CMakeLists.txt

@@ -20,11 +20,7 @@ if (SPM_ABSL_PROVIDER STREQUAL "module" OR SPM_ABSL_PROVIDER STREQUAL "package")
   list(APPEND SPM_LIBS absl::flags_parse)
   list(APPEND SPM_LIBS absl::log)
   list(APPEND SPM_LIBS absl::check)
-  if (MSVC)
-   add_definitions("/D_USE_EXTERNAL_ABSL")
-  else()
-   add_definitions("-D_USE_EXTERNAL_ABSL")
-  endif()
+  add_compile_definitions(_USE_EXTERNAL_ABSL)
 elseif (SPM_ABSL_PROVIDER STREQUAL "internal")
   set(ABSL_FLAGS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/absl/flags/flag.cc)
 endif()
@@ -76,22 +72,12 @@ elseif (SPM_PROTOBUF_PROVIDER STREQUAL "package")
   protobuf_generate_cpp(SPM_MODEL_PROTO_SRCS SPM_MODEL_PROTO_HDRS sentencepiece_model.proto)
   set(PROTOBUF_LITE_SRCS "")
   include_directories(${PROTOBUF_INCLUDE_DIR})
-  if (MSVC)
-    add_definitions("/D_USE_EXTERNAL_PROTOBUF")
-  else()
-    add_definitions("-D_USE_EXTERNAL_PROTOBUF")
-  endif()
+  add_compile_definitions(_USE_EXTERNAL_PROTOBUF)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../third_party)
 
-if (MSVC)
-  add_definitions("/D_USE_INTERNAL_STRING_VIEW")
-else()
-  add_definitions("-D_USE_INTERNAL_STRING_VIEW")
-endif()
-
 set(SPM_SRCS
   ${PROTOBUF_LITE_SRCS}
   ${SPM_PROTO_HDRS}
@@ -187,12 +173,12 @@ list(APPEND SPM_LIBS ${PROTOBUF_LITE_LIBRARY} Threads::Threads)
 if (SPM_ENABLE_NFKC_COMPILE)
   find_package(ICU 4.4 COMPONENTS i18n data uc REQUIRED)
   include_directories(${ICU_INCLUDE_DIRS})
-  add_definitions(-DENABLE_NFKC_COMPILE)
+  add_compile_definitions(ENABLE_NFKC_COMPILE)
   list(APPEND SPM_LIBS ICU::i18n ICU::data ICU::uc)
 endif()
 
 if (SPM_DISABLE_EMBEDDED_DATA)
-  add_definitions(-DDISABLE_EMBEDDED_DATA)
+  add_compile_definitions(DISABLE_EMBEDDED_DATA)
 endif()
 
 if (SPM_ENABLE_TCMALLOC)

src/init_test.cc

@@ -17,6 +17,8 @@
 #include "common.h"
 #include "testharness.h"
 
+#ifndef _USE_EXTERNAL_ABSL
+
 ABSL_FLAG(int32_t, int32_f, 10, "int32_flags");
 ABSL_FLAG(bool, bool_f, false, "bool_flags");
 ABSL_FLAG(int64_t, int64_f, 9223372036854775807LL, "int64_flags");
@@ -87,8 +89,6 @@ TEST(FlagsTest, ParseCommandLineFlagsTest3) {
   EXPECT_EQ(1, argc);
 }
 
-#ifndef _USE_EXTERNAL_ABSL
-
 TEST(FlagsTest, ParseCommandLineFlagsHelpTest) {
   const char *kFlags[] = {"program", "--help"};
   int argc = arraysize(kFlags);
@@ -143,5 +143,6 @@ TEST(FlagsTest, ParseCommandLineFlagsEmptyIntArgs) {
   char **argv = const_cast<char **>(kFlags);
   EXPECT_DEATH(ParseCommandLineFlags(kFlags[0], &argc, &argv), );
 }
-#endif  // _USE_EXTERNAL_ABSL
 }  // namespace absl
+
+#endif  // _USE_EXTERNAL_ABSL

src/sentencepiece_processor.h

@@ -23,11 +23,15 @@
 #include <utility>
 #include <vector>
 
+#ifdef _USE_EXTERNAL_ABSL
+#include "third_party/absl/strings/string_view.h"
+#else  // _USE_EXTERNAL_ABSL
 #ifndef SWIG
 namespace absl {
 using std::string_view;
 }  // namespace absl
 #endif  // SWIG
+#endif  // _USE_EXTERNAL_ABSL
 
 namespace sentencepiece {
 namespace util {