From f84eb3dde6acfec91d7c5cb0672ef4e7314d6f4d Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 16 Aug 2018 17:16:02 +0300 Subject: [PATCH] Fixed core headers installation in world builds --- modules/core/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 455afaf593..fa72e71658 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -33,9 +33,14 @@ if(CV_TRACE AND HAVE_ITT AND BUILD_ITT) add_definitions(-DOPENCV_WITH_ITT=1) endif() -file(GLOB lib_cuda_hdrs "include/opencv2/${name}/cuda/*.hpp" "include/opencv2/${name}/cuda/*.h") -file(GLOB lib_cuda_hdrs_detail "include/opencv2/${name}/cuda/detail/*.hpp" "include/opencv2/${name}/cuda/detail/*.h") -file(GLOB_RECURSE module_opencl_hdrs "include/opencv2/${name}/opencl/*") +file(GLOB lib_cuda_hdrs + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cuda/*.hpp" + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cuda/*.h") +file(GLOB lib_cuda_hdrs_detail + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cuda/detail/*.hpp" + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cuda/detail/*.h") +file(GLOB_RECURSE module_opencl_hdrs + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/opencl/*") source_group("Include\\Cuda Headers" FILES ${lib_cuda_hdrs}) source_group("Include\\Cuda Headers\\Detail" FILES ${lib_cuda_hdrs_detail})