Fixes include path when using external protobuf

google · Apr 10, 2023 · 119e58d · 119e58d
1 parent 2b07137
commit 119e58d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -74,6 +74,11 @@ else()
   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()
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

diff --git a/src/init.h b/src/init.h
@@ -18,7 +18,12 @@
 #include "common.h"
 #include "third_party/absl/flags/flag.h"
 #include "third_party/absl/flags/parse.h"
+
+#ifdef _USE_EXTERNAL_PROTOBUF
+#include "google/protobuf/message_lite.h"
+#else
 #include "third_party/protobuf-lite/google/protobuf/message_lite.h"
+#endif
 
 ABSL_DECLARE_FLAG(int32, minloglevel);