From 67c37446bd01d1580c1031e4135129a60dbb5726 Mon Sep 17 00:00:00 2001 From: rainy liu Date: Wed, 29 May 2024 20:20:31 +0800 Subject: [PATCH] ARCH->OPENCV_DART_ARCH --- linux/CMakeLists.txt | 8 ++++---- windows/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index d29c17a4..cc62b11e 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -8,11 +8,11 @@ set(PROJECT_NAME "opencv_dart") project(${PROJECT_NAME} LANGUAGES CXX) # Define default architecture -set(ARCH "x64") +set(OPENCV_DART_ARCH "x64") # Print messages -message(STATUS "Auto-selected architecture: ${ARCH}") -message(STATUS "Running setup with architecture: ${ARCH}") +message(STATUS "Auto-selected architecture: ${OPENCV_DART_ARCH}") +message(STATUS "Running setup with architecture: ${OPENCV_DART_ARCH}") # Get the parent directory of the current working directory get_filename_component(PARENT_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY) @@ -21,7 +21,7 @@ get_filename_component(PARENT_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY) find_program(DART_PATH dart) message(STATUS "${PROJECT_NAME} using dart from: ${DART_PATH}") execute_process( - COMMAND ${DART_PATH} run opencv_dart:setup linux --arch ${ARCH} + COMMAND ${DART_PATH} run opencv_dart:setup linux --arch ${OPENCV_DART_ARCH} TIMEOUT 120 WORKING_DIRECTORY ${PARENT_DIR} ) diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 433ad5b6..a34a1932 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -9,11 +9,11 @@ set(PROJECT_NAME "opencv_dart") project(${PROJECT_NAME} LANGUAGES CXX) # Define default architecture -set(ARCH "x64") +set(OPENCV_DART_ARCH "x64") # Print messages -message(STATUS "Auto-selected architecture: ${ARCH}") -message(STATUS "Running setup with architecture: ${ARCH}") +message(STATUS "Auto-selected architecture: ${OPENCV_DART_ARCH}") +message(STATUS "Running setup with architecture: ${OPENCV_DART_ARCH}") # Get the parent directory of the current working directory get_filename_component(PARENT_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY) @@ -22,7 +22,7 @@ get_filename_component(PARENT_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY) find_program(DART_PATH dart.bat) execute_process( - COMMAND ${DART_PATH} run opencv_dart:setup windows -a ${ARCH} + COMMAND ${DART_PATH} run opencv_dart:setup windows -a ${OPENCV_DART_ARCH} TIMEOUT 120 WORKING_DIRECTORY ${PARENT_DIR} )