actiona: fix cross

This commit is contained in:
Đoàn Trần Công Danh
2025-12-21 18:13:10 +07:00
parent 6b235e9451
commit 03cff102a3
+19 -10
View File
@@ -1,11 +1,20 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ function(setup_target TARGET)
endfunction()
--- a/actiontools/CMakeLists.txt
+++ b/actiontools/CMakeLists.txt
@@ -294,11 +294,17 @@ setup_target(${PROJECT})
find_package(OpenCV REQUIRED core imgproc)
find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml QmlPrivate REQUIRED)
function(compile_translations TARGET)
- find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS LinguistTools REQUIRED)
+ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Linguist REQUIRED)
set(TS_FILES
${CMAKE_CURRENT_SOURCE_DIR}/translations/${TARGET}_fr_FR.ts
+set(_toolchain_file "")
+if (DEFINED CMAKE_TOOLCHAIN_FILE)
+ set(_toolchain_file "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+endif()
+
ExternalProject_Add(external_qtjsapi
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtjsapi
BINARY_DIR ${CMAKE_BINARY_DIR}/3rdparty/qtjsapi
INSTALL_COMMAND cmake -E echo "Skipping install step."
CMAKE_ARGS
+ ${_toolchain_file}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
)