ci: fix build error

MaaXYZ · Oct 11, 2023 · e1aa418 · e1aa418
1 parent fbc459b
commit e1aa418
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,9 +25,11 @@ include(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
 
 if(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
     include(${PROJECT_SOURCE_DIR}/cmake/thrift-gen.cmake)
+    add_compile_definitions(WITH_THRIFT)
 endif()
 if(WITH_GRPC)
     include(${PROJECT_SOURCE_DIR}/cmake/grpc-gen.cmake)
+    add_compile_definitions(WITH_GRPC)
 endif()
 
 find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -40,14 +40,6 @@ elseif(UNIX)
     set(CMAKE_INSTALL_RPATH "$ORIGIN")
 endif()
 
-if(WITH_THRIFT)
-    add_compile_definitions(WITH_THRIFT)
-endif(WITH_THRIFT)
-
-if(WITH_GRPC)
-    add_compile_definitions(WITH_GRPC)
-endif(WITH_GRPC)
-
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

diff --git a/source/MaaFramework/CMakeLists.txt b/source/MaaFramework/CMakeLists.txt
@@ -19,9 +19,9 @@ target_include_directories(
 target_compile_definitions(MaaFramework PRIVATE MAA_FRAMEWORK_EXPORTS)
 
 target_link_libraries(MaaFramework MaaControlUnit MaaUtils)
-if(WITH_THRIFT)
+if(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
     target_link_libraries(MaaFramework MaaThriftController)
-endif(WITH_THRIFT)
+endif(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
 target_link_libraries(MaaFramework ${OpenCV_LIBS} fastdeploy_ppocr ONNXRuntime::ONNXRuntime HeaderOnlyLibraries)
 
 # clang 15之后有ranges if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") find_package(range-v3 REQUIRED)