build: install msgfmt by vcpkg

NJUPT-SAST · Sep 26, 2024 · 115a688 · 115a688
1 parent f971ad1
commit 115a688
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -114,6 +114,7 @@ jobs:
           Import-Module (Join-Path $vsPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
           Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments '-arch=${{ matrix.msvc_arch }} -host_arch=x64'
           $additionalConfigureArgs += '-DPKG_CONFIG_EXECUTABLE:FILEPATH=./build/vcpkg_installed/x64-windows/tools/pkgconf/pkgconf.exe'
+          $additionalConfigureArgs += '-DMSGFMT_EXECUTABLE:FILEPATH=./build/vcpkg_installed/x64-windows/tools/gettext/bin/msgfmt.exe'
         }
         if ($vcpkgTargetTriplet) {
           $additionalConfigureArgs += "-DVCPKG_TARGET_TRIPLET:STRING=$vcpkgTargetTriplet"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,7 +64,7 @@ if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/3rdpart/sast-link-cxx-sdk/CMakeLists
   message(FATAL_ERROR "Git submodule not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.")
 endif()
 
-#i18n
+# i18n
 set(SOURCE_LOCALE_DIR "${CMAKE_SOURCE_DIR}/ui/locale")
 
 # source code

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -77,11 +77,13 @@ if (WIN32)
   add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}> COMMAND_EXPAND_LISTS)
 endif()
 
+find_program(MSGFMT_EXECUTABLE msgfmt REQUIRED)
+
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E make_directory ${SOURCE_LOCALE_DIR}/en/LC_MESSAGES
-  COMMAND msgfmt ${SOURCE_LOCALE_DIR}/en.po -o ${SOURCE_LOCALE_DIR}/en/LC_MESSAGES/sast-evento.mo
+  COMMAND ${MSGFMT_EXECUTABLE} ${SOURCE_LOCALE_DIR}/en.po -o ${SOURCE_LOCALE_DIR}/en/LC_MESSAGES/sast-evento.mo
   COMMAND ${CMAKE_COMMAND} -E make_directory ${SOURCE_LOCALE_DIR}/zh/LC_MESSAGES
-  COMMAND msgfmt ${SOURCE_LOCALE_DIR}/zh.po -o ${SOURCE_LOCALE_DIR}/zh/LC_MESSAGES/sast-evento.mo
+  COMMAND ${MSGFMT_EXECUTABLE} ${SOURCE_LOCALE_DIR}/zh.po -o ${SOURCE_LOCALE_DIR}/zh/LC_MESSAGES/sast-evento.mo
 )
 
 add_subdirectory(Tray)
diff --git a/src/Infrastructure/Utils/Config.h b/src/Infrastructure/Utils/Config.h
@@ -40,7 +40,7 @@ const std::filesystem::path localePath =
 #ifdef EVENTO_DEBUG
     LOCALE_DIR;
 #else
-    boost::dll::program_location().parent_path() / "locale";
+    std::filesystem::path{(boost::dll::program_location().parent_path() / "locale").string()};
 #endif // EVENTO_DEBUG
 
 inline struct Settings {

diff --git a/vcpkg.json b/vcpkg.json
@@ -10,6 +10,13 @@
         "nlohmann-json",
         "spdlog",
         "tomlplusplus",
+        {
+            "name": "gettext",
+            "features": [
+                "tools"
+            ],
+            "host": true
+        },
         "gettext-libintl",
         {
             "name": "pkgconf",
-Original file line number
+Diff line change
@@ Expand Up @@
       message(FATAL_ERROR "Git submodule not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.")
     endif()
-    #i18n
+    # i18n
     set(SOURCE_LOCALE_DIR "${CMAKE_SOURCE_DIR}/ui/locale")
     # source code
@@ Expand Down @@