use C++20 (#11)

fcitx-contrib · Mar 8, 2025 · fa5e238 · fa5e238
1 parent 068918e
commit fa5e238
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,6 @@ jobs:
           C:/msys64/usr/bin/pacman -S --noconfirm `
             mingw-w64-clang-x86_64-extra-cmake-modules `
             cmake `
-            fmt `
             gcc `
             gettext-devel `
             libuv-devel `
@@ -64,7 +63,6 @@ jobs:
           C:/msys64/usr/bin/pacman -S --noconfirm `
             mingw-w64-clang-${{ matrix.pkg_arch }}-extra-cmake-modules `
             mingw-w64-clang-${{ matrix.pkg_arch }}-dlfcn `
-            mingw-w64-clang-${{ matrix.pkg_arch }}-fmt `
             mingw-w64-clang-${{ matrix.pkg_arch }}-libuv `
             mingw-w64-clang-x86_64-clang `
             mingw-w64-clang-x86_64-cmake `

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(fcitx5-windows VERSION 0.1.0)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 option(ENABLE_TESTING_ADDONS "" OFF)
 option(ENABLE_TEST "" OFF)

diff --git a/fcitx5 b/fcitx5
diff --git a/src/main.cpp b/src/main.cpp
@@ -21,11 +21,11 @@ void setupEnv() {
     GetModuleFileNameA(NULL, path, MAX_PATH);
     auto rootPath = ::fs::path(path).parent_path().parent_path();
     auto fcitx_addon_dirs = rootPath / "lib" / "fcitx5";
-    setenv("FCITX_ADDON_DIRS", fcitx_addon_dirs.u8string());
+    setenv("FCITX_ADDON_DIRS", fcitx_addon_dirs.string());
     auto xdg_data_dirs = rootPath / "share";
     auto fcitx_data_dirs = xdg_data_dirs / "fcitx5";
-    setenv("XDG_DATA_DIRS", xdg_data_dirs.u8string());
-    setenv("FCITX_DATA_DIRS", fcitx_data_dirs.u8string());
+    setenv("XDG_DATA_DIRS", xdg_data_dirs.string());
+    setenv("FCITX_DATA_DIRS", fcitx_data_dirs.string());
 }
 
 void start() {