From f8f425e34c47dc2a95c3082d56d073d0a81295aa Mon Sep 17 00:00:00 2001 From: Tinson Lai Date: Fri, 3 Feb 2023 18:02:45 +0800 Subject: [PATCH] Change custom_hal.hpp output location --- CMakeLists.txt | 2 +- modules/core/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a620c94af..cbf43a1605 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -912,7 +912,7 @@ foreach(hal ${OpenCV_HAL}) endif() endif() endforeach() -configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/custom_hal.hpp.in" "${CMAKE_BINARY_DIR}/custom_hal.hpp" @ONLY) +configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/custom_hal.hpp.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/custom_hal.hpp" @ONLY) unset(_hal_includes) diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index fe747540e8..517b0f31a5 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -179,7 +179,7 @@ ocv_install_3rdparty_licenses(SoftFloat "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/So # generate data (samples data) config file -set(OPENCV_DATA_CONFIG_FILE "${CMAKE_BINARY_DIR}/opencv_data_config.hpp") +set(OPENCV_DATA_CONFIG_FILE "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv_data_config.hpp") set(OPENCV_DATA_CONFIG_STR "") if(CMAKE_INSTALL_PREFIX)