potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

fixed #768 ticket

Browse Source 
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
This commit is contained in:
Alexander Shishkov
2011-06-14 10:19:56 +00:00
parent ca758a9dac
commit 6ecebb7f66
8 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/CMakeLists.txt
+1 -1
View File
@@ -194,7 +194,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
source_group("Src" FILES ${test_hdrs} ${test_srcs})
if(HAVE_CUDA)
include_directories(${CUDA_INCLUDE_DIRS} ${OPENCV_SOURCE_DIR}/modules/gpu/src/nvidia ${OPENCV_SOURCE_DIR}/modules/gpu/src/nvidia/core ${OPENCV_SOURCE_DIR}/modules/gpu/src/nvidia/NPP_staging)
include_directories(${CUDA_INCLUDE_DIRS} ${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia ${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/core ${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/NPP_staging)
file(GLOB nvidia "test/nvidia/*.cpp" "test/nvidia/*.h*")
source_group("Src\\NVidia" FILES ${nvidia})
modules/haartraining/CMakeLists.txt
+11 -11
View File
@@ -2,20 +2,20 @@ project(haartraining)
include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include"
"${OpenCV_SOURCE_DIR}/modules/core/include"
"${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OpenCV_SOURCE_DIR}/modules/video/include"
"${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OpenCV_SOURCE_DIR}/modules/legacy/include"
)
if(WIN32)
link_directories(${OPENCV_SOURCE_DIR}/lib ${OPENCV_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
link_directories(${OpenCV_SOURCE_DIR}/lib ${OpenCV_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
endif()
set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)
modules/python/CMakeLists.txt
+21 -21
View File
@@ -7,31 +7,31 @@ include_directories(${PYTHON_INCLUDE_PATH})
include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}/src1"
"${CMAKE_CURRENT_SOURCE_DIR}/src2"
"${OPENCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include"
"${OPENCV_SOURCE_DIR}/modules/contrib/include"
"${OpenCV_SOURCE_DIR}/modules/core/include"
"${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OpenCV_SOURCE_DIR}/modules/video/include"
"${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OpenCV_SOURCE_DIR}/modules/legacy/include"
"${OpenCV_SOURCE_DIR}/modules/contrib/include"
)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(opencv_hdrs "${OPENCV_SOURCE_DIR}/modules/core/include/opencv2/core/core.hpp"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include/opencv2/imgproc/imgproc.hpp"
"${OPENCV_SOURCE_DIR}/modules/video/include/opencv2/video/background_segm.hpp"
"${OPENCV_SOURCE_DIR}/modules/video/include/opencv2/video/tracking.hpp"
"${OPENCV_SOURCE_DIR}/modules/highgui/include/opencv2/highgui/highgui.hpp"
"${OPENCV_SOURCE_DIR}/modules/ml/include/opencv2/ml/ml.hpp"
"${OPENCV_SOURCE_DIR}/modules/features2d/include/opencv2/features2d/features2d.hpp"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include/opencv2/calib3d/calib3d.hpp"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include/opencv2/objdetect/objdetect.hpp"
"${OPENCV_SOURCE_DIR}/modules/python/src2/opencv_extra_api.hpp")
set(opencv_hdrs "${OpenCV_SOURCE_DIR}/modules/core/include/opencv2/core/core.hpp"
"${OpenCV_SOURCE_DIR}/modules/imgproc/include/opencv2/imgproc/imgproc.hpp"
"${OpenCV_SOURCE_DIR}/modules/video/include/opencv2/video/background_segm.hpp"
"${OpenCV_SOURCE_DIR}/modules/video/include/opencv2/video/tracking.hpp"
"${OpenCV_SOURCE_DIR}/modules/highgui/include/opencv2/highgui/highgui.hpp"
"${OpenCV_SOURCE_DIR}/modules/ml/include/opencv2/ml/ml.hpp"
"${OpenCV_SOURCE_DIR}/modules/features2d/include/opencv2/features2d/features2d.hpp"
"${OpenCV_SOURCE_DIR}/modules/calib3d/include/opencv2/calib3d/calib3d.hpp"
"${OpenCV_SOURCE_DIR}/modules/objdetect/include/opencv2/objdetect/objdetect.hpp"
"${OpenCV_SOURCE_DIR}/modules/python/src2/opencv_extra_api.hpp")
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
modules/stitching/CMakeLists.txt
+12 -12
View File
@@ -2,18 +2,18 @@ project(stitching)
include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/src" # for gcgraph.hpp
"${OPENCV_SOURCE_DIR}/modules/gpu/include"
"${OpenCV_SOURCE_DIR}/modules/core/include"
"${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OpenCV_SOURCE_DIR}/modules/video/include"
"${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OpenCV_SOURCE_DIR}/modules/legacy/include"
"${OpenCV_SOURCE_DIR}/modules/imgproc/src" # for gcgraph.hpp
"${OpenCV_SOURCE_DIR}/modules/gpu/include"
)
set(stitching_libs opencv_core opencv_imgproc opencv_highgui opencv_features2d opencv_calib3d opencv_gpu)
modules/traincascade/CMakeLists.txt
+10 -10
View File
@@ -2,16 +2,16 @@ project(traincascade)
include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include"
"${OpenCV_SOURCE_DIR}/modules/core/include"
"${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OpenCV_SOURCE_DIR}/modules/video/include"
"${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OpenCV_SOURCE_DIR}/modules/legacy/include"
)
set(traincascade_libs opencv_core opencv_ml opencv_imgproc