Make BinaryDict.hpp and DartsDict.hpp usable alone (#550)

From d18eac4ee14b871c2c9ebeb9fc9ee797e6b2109a Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis <[email protected]> Date: Tue, 2 Mar 2021 00:00:00 +0000
BYVoid · Mar 4, 2021 · 736b93d · 736b93d
1 parent 8015eed
commit 736b93d
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 9 deletions.
diff --git a/node/node_opencc.gypi b/node/node_opencc.gypi
@@ -6,6 +6,7 @@
       "../node/opencc.cc",
     ],
     "include_dirs": [
+      "../node",
       "../src",
       "../deps/rapidjson-1.1.0",
       "../deps/marisa-0.2.6/include",

diff --git a/node/opencc_config.h b/node/opencc_config.h
@@ -0,0 +1,21 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2021 Carbo Kuo <[email protected]>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+/* #undef OPENCC_ENABLE_DARTS */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,8 @@
 include (GenerateExportHeader)
+
+include_directories("${PROJECT_BINARY_DIR}/src")
+include_directories("${PROJECT_SOURCE_DIR}/src")
+
 if(NOT USE_SYSTEM_MARISA)
   include_directories(../deps/marisa-0.2.6/include)
 endif()
@@ -38,6 +42,7 @@ set(
   UTF8StringSlice.hpp
   UTF8Util.hpp
   opencc.h
+  "${PROJECT_BINARY_DIR}/src/opencc_config.h"
 )
 
 set(
@@ -78,6 +83,7 @@ set(UNITTESTS
 )
 
 if (ENABLE_DARTS)
+  set(OPENCC_ENABLE_DARTS 1)
   if(NOT USE_SYSTEM_DARTS)
     include_directories(../deps/darts-clone)
   endif()
@@ -101,6 +107,10 @@ if (ENABLE_DARTS)
   )
 endif()
 
+configure_file(
+  "${PROJECT_SOURCE_DIR}/src/opencc_config.h.in"
+  "${PROJECT_BINARY_DIR}/src/opencc_config.h")
+
 add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
 set_target_properties(libopencc PROPERTIES POSITION_INDEPENDENT_CODE ON)
 source_group(libopencc FILES ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})

diff --git a/src/Common.hpp b/src/Common.hpp
@@ -30,6 +30,7 @@
 
 #include "Export.hpp"
 #include "Optional.hpp"
+#include "opencc_config.h"
 
 // Forward decalarations and alias
 namespace opencc {
@@ -61,7 +62,7 @@ typedef std::shared_ptr<Segments> SegmentsPtr;
 typedef std::shared_ptr<SerializableDict> SerializableDictPtr;
 typedef std::shared_ptr<TextDict> TextDictPtr;
 
-#ifdef ENABLE_DARTS
+#ifdef OPENCC_ENABLE_DARTS
 class BinaryDict;
 class DartsDict;
 typedef std::shared_ptr<BinaryDict> BinaryDictPtr;
@@ -79,6 +80,3 @@ const std::string PACKAGE_DATA_DIRECTORY = PKGDATADIR "/";
 #ifndef VERSION
 #define VERSION "1.0.*"
 #endif // ifndef VERSION
-
-// The following definitions are provided by CMake
-// #define ENABLE_DARTS
diff --git a/src/benchmark/CMakeLists.txt b/src/benchmark/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(..)
-
 add_executable(performance Performance.cpp)
 target_link_libraries(performance benchmark libopencc)
 add_test(BenchmarkTest performance)

diff --git a/src/opencc_config.h.in b/src/opencc_config.h.in
@@ -0,0 +1,21 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2021 Carbo Kuo <[email protected]>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#cmakedefine OPENCC_ENABLE_DARTS
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(..)
-
 # Executables
 
 ## opencc

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,5 @@
-include_directories(../src)
+include_directories("${PROJECT_BINARY_DIR}/src")
+include_directories("${PROJECT_SOURCE_DIR}/src")
 
 set(CONFIG_TEST
   config_test/config_test.json