From 79ffaa8ce9bc527a99650d6c241a527f2d1d04b1 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 24 Mar 2016 17:39:16 +0300 Subject: [PATCH] Fixed cutom_hal.hpp file generation --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7e9d5f..aff7515 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -606,6 +606,7 @@ include(cmake/OpenCVDetectVTK.cmake) # Package config in: OpenCV_HALConfig.cmake or opencv_hal-config.cmake # Use variables: OpenCV_HAL_LIBRARIES, OpenCV_HAL_HEADERS and OpenCV_HAL_INCLUDE_DIRS variables find_package(OpenCV_HAL CONFIG QUIET) +set(_includes "") if (OpenCV_HAL_FOUND) # 1. libraries foreach (l ${OpenCV_HAL_LIBRARIES}) @@ -613,15 +614,14 @@ if (OpenCV_HAL_FOUND) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${l}) endforeach() # 2. headers - set(_includes "") foreach (h ${OpenCV_HAL_HEADERS}) set(_includes "${_includes}\n#include \"${h}\"") endforeach() - configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/custom_hal.hpp.in" "${CMAKE_BINARY_DIR}/custom_hal.hpp" @ONLY) - unset(_includes) # 3. include paths ocv_include_directories(${OpenCV_HAL_INCLUDE_DIRS}) endif() +configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/custom_hal.hpp.in" "${CMAKE_BINARY_DIR}/custom_hal.hpp" @ONLY) +unset(_includes) # ---------------------------------------------------------------------------- # Add CUDA libraries (needed for apps/tools, samples) -- 2.7.4