Skip to content

Commit 9097ccf

Browse files
committed
drop legacy headers
1 parent 80610ca commit 9097ccf

File tree

16 files changed

+2
-1349
lines changed

16 files changed

+2
-1349
lines changed

apps/traincascade/boost.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ using cv::ParallelLoopBody;
3030
#include "boost.h"
3131
#include "cascadeclassifier.h"
3232
#include <queue>
33-
#include "cxmisc.h"
3433

3534
#include "cvconfig.h"
3635

cmake/OpenCVGenConfig.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif()
3333
# -------------------------------------------------------------------------------------------
3434
# Part 1/3: ${BIN_DIR}/OpenCVConfig.cmake -> For use *without* "make install"
3535
# -------------------------------------------------------------------------------------------
36-
set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\" \"${OpenCV_SOURCE_DIR}/include\" \"${OpenCV_SOURCE_DIR}/include/opencv\"")
36+
set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\" \"${OpenCV_SOURCE_DIR}/include\"")
3737

3838
foreach(m ${OPENCV_MODULES_BUILD})
3939
if(EXISTS "${OPENCV_MODULE_${m}_LOCATION}/include")
@@ -68,7 +68,7 @@ configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.
6868
# Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
6969
# -------------------------------------------------------------------------------------------
7070
file(RELATIVE_PATH OpenCV_INSTALL_PATH_RELATIVE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/${OPENCV_CONFIG_INSTALL_PATH}/" ${CMAKE_INSTALL_PREFIX})
71-
set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_INCLUDE_INSTALL_PATH}\" \"\${OpenCV_INSTALL_PATH}/${OPENCV_INCLUDE_INSTALL_PATH}/opencv\"")
71+
set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_INCLUDE_INSTALL_PATH}\"")
7272

7373
if(USE_IPPICV)
7474
file(RELATIVE_PATH IPPICV_INSTALL_PATH_RELATIVE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}" "${IPPICV_INSTALL_PATH}")

include/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
file(GLOB old_hdrs "opencv/*.h*")
2-
install(FILES ${old_hdrs}
3-
DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv
4-
COMPONENT dev)
51
install(FILES "opencv2/opencv.hpp"
62
DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
73
COMPONENT dev)

include/opencv/cv.h

-73
This file was deleted.

include/opencv/cv.hpp

-60
This file was deleted.

include/opencv/cvaux.h

-57
This file was deleted.

include/opencv/cvaux.hpp

-52
This file was deleted.

include/opencv/cvwimage.h

-46
This file was deleted.

include/opencv/cxcore.h

-52
This file was deleted.

0 commit comments

Comments
 (0)