fix hallelujah config collision; simplify build (#30)

fcitx-contrib · Dec 8, 2024 · 3477ae1 · 3477ae1
1 parent 602d1e5
commit 3477ae1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,6 @@ jobs:
             -DURL_SCHEME=fcitx \
             -DHALLELUJAH=ON \
             -DRIME=ON \
-            -DCMAKE_TOOLCHAIN_FILE=cmake/ios.cmake \
             -DIOS_PLATFORM=SIMULATOR
           cmake --build build --config Release
 

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,7 +12,7 @@
         {
             "type": "shell",
             "label": "Configure",
-            "command": "cmake -B build -G Xcode -DURL_SCHEME=fcitx -DCHINESE_ADDONS=ON -DHALLELUJAH=ON -DRIME=ON -DCMAKE_TOOLCHAIN_FILE=cmake/ios.cmake -DIOS_PLATFORM=SIMULATOR",
+            "command": "cmake -B build -G Xcode -DURL_SCHEME=fcitx -DCHINESE_ADDONS=ON -DHALLELUJAH=ON -DRIME=ON -DIOS_PLATFORM=SIMULATOR",
             "group": {
                 "kind": "build"
             }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.27)
 # Avoid MinSizeRel and RelWithDebInfo.
 set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING INTERNAL FORCE)
 
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cmake/ios.cmake")
+
 project(fcitx5-ios VERSION 0.1.0 LANGUAGES CXX Swift)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 15)
 set(CMAKE_Swift_LANGUAGE_VERSION 5.9)

diff --git a/common/common.cpp b/common/common.cpp
@@ -7,7 +7,7 @@
 
 namespace fs = std::filesystem;
 
-extern fcitx::StaticAddonRegistry &getStaticAddon();
+FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon)
 
 std::unique_ptr<fcitx::Instance> instance;
 std::unique_ptr<fcitx::EventDispatcher> dispatcher;

diff --git a/engines/fcitx5-hallelujah b/engines/fcitx5-hallelujah
diff --git a/keyboard/fcitx.cpp b/keyboard/fcitx.cpp
@@ -6,8 +6,6 @@
 
 #include <fcitx/inputmethodmanager.h>
 
-FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon)
-
 fcitx::IosFrontend *frontend;
 
 void startFcitx(const char *bundlePath, const char *appGroupPath) {

diff --git a/src/fcitx.cpp b/src/fcitx.cpp
@@ -4,8 +4,6 @@
 #include <fcitx/inputmethodmanager.h>
 #include <nlohmann/json.hpp>
 
-FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon)
-
 void startFcitx(const char *bundlePath, const char *appGroupPath) {
     if (instance) {
         return;
+3 −3		src/factory.cpp
+2 −2		src/factory.h
+2 −2		src/hallelujah.cpp
+2 −2		src/hallelujah.h