diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 57621ceb8f..abcc4e19be 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -779,6 +779,7 @@ macro(ocv_glob_module_sources) "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/hal/*.h" "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/utils/*.hpp" "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/utils/*.h" + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/legacy/*.h" ) file(GLOB lib_hdrs_detail "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/detail/*.hpp" @@ -1011,6 +1012,8 @@ macro(_ocv_create_module) string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}") if(NOT hdr2 MATCHES "private" AND hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$" ) install(FILES ${hdr} OPTIONAL DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev) + else() + #message("Header file will be NOT installed: ${hdr}") endif() endforeach() endif() diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt index d771224d4c..6d21df1039 100644 --- a/modules/imgcodecs/CMakeLists.txt +++ b/modules/imgcodecs/CMakeLists.txt @@ -102,6 +102,7 @@ file(GLOB imgcodecs_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp" "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp" "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h" + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/legacy/*.h" ) if(IOS) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index a7c760b5c5..3d15fc839a 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -32,7 +32,9 @@ set(videoio_srcs file(GLOB videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp" "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp" - "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h") + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h" + "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/legacy/*.h" +) # Removing WinRT API headers by default list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cap_winrt.hpp") diff --git a/samples/cpp/tutorial_code/compatibility/compatibility_test.cpp b/samples/cpp/tutorial_code/compatibility/compatibility_test.cpp new file mode 100644 index 0000000000..c556e9e2ac --- /dev/null +++ b/samples/cpp/tutorial_code/compatibility/compatibility_test.cpp @@ -0,0 +1,19 @@ +#include + +#include + +#include +#include +#include +#include + +using namespace cv; + +int main(int /*argc*/, const char** /*argv*/) +{ + std::cout + << (int)CV_LOAD_IMAGE_GRAYSCALE + << (int)CV_CAP_FFMPEG + << std::endl; + return 0; +}