From bbfbdd9da1c9cb8247d1e6fee23139a3cd2fb900 Mon Sep 17 00:00:00 2001 From: apavlenko Date: Fri, 18 Nov 2016 10:40:47 +0300 Subject: [PATCH] moving hal to a separate folder --- 3rdparty/openvx/CMakeLists.txt | 7 ++++--- 3rdparty/openvx/hal/README.md | 4 ++++ 3rdparty/openvx/{src => hal}/openvx_hal.cpp | 0 3rdparty/openvx/{include => hal}/openvx_hal.hpp | 0 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 3rdparty/openvx/hal/README.md rename 3rdparty/openvx/{src => hal}/openvx_hal.cpp (100%) rename 3rdparty/openvx/{include => hal}/openvx_hal.hpp (100%) diff --git a/3rdparty/openvx/CMakeLists.txt b/3rdparty/openvx/CMakeLists.txt index 4c71ecfe6b..699cf91617 100644 --- a/3rdparty/openvx/CMakeLists.txt +++ b/3rdparty/openvx/CMakeLists.txt @@ -1,5 +1,6 @@ -add_library(openvx_hal STATIC src/openvx_hal.cpp include/openvx_hal.hpp include/ivx.hpp include/ivx_lib_debug.hpp) +add_library(openvx_hal STATIC hal/openvx_hal.cpp hal/openvx_hal.hpp include/ivx.hpp include/ivx_lib_debug.hpp) target_include_directories(openvx_hal PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/hal ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/modules/core/include ${CMAKE_SOURCE_DIR}/modules/imgproc/include @@ -14,5 +15,5 @@ endif() set(OPENVX_HAL_FOUND TRUE PARENT_SCOPE) set(OPENVX_HAL_VERSION 0.0.1 PARENT_SCOPE) set(OPENVX_HAL_LIBRARIES "openvx_hal" PARENT_SCOPE) -set(OPENVX_HAL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/openvx_hal.hpp" PARENT_SCOPE) -set(OPENVX_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include" "${OPENVX_INCLUDE_DIR}" PARENT_SCOPE) +set(OPENVX_HAL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/hal/openvx_hal.hpp" PARENT_SCOPE) +set(OPENVX_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/hal" "${OPENVX_INCLUDE_DIR}" PARENT_SCOPE) diff --git a/3rdparty/openvx/hal/README.md b/3rdparty/openvx/hal/README.md new file mode 100644 index 0000000000..a4266015a7 --- /dev/null +++ b/3rdparty/openvx/hal/README.md @@ -0,0 +1,4 @@ +#OpenVX-based HAL implementation. +It's built when OpenVX is available (`HAVE_OPENVX`). +To build OpenCV with OpenVX support add the following **cmake** options: +`-DOPENVX_ROOT=/path/to/prebuilt/openvx -DWITH_OPENVX=YES` \ No newline at end of file diff --git a/3rdparty/openvx/src/openvx_hal.cpp b/3rdparty/openvx/hal/openvx_hal.cpp similarity index 100% rename from 3rdparty/openvx/src/openvx_hal.cpp rename to 3rdparty/openvx/hal/openvx_hal.cpp diff --git a/3rdparty/openvx/include/openvx_hal.hpp b/3rdparty/openvx/hal/openvx_hal.hpp similarity index 100% rename from 3rdparty/openvx/include/openvx_hal.hpp rename to 3rdparty/openvx/hal/openvx_hal.hpp