Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed #768 ticket

Browse Source 
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
pull/13383/head
Alexander Shishkov 14 years ago
parent ca758a9dac
commit 6ecebb7f66
8 changed files with 63 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      CMakeLists.txt
  2. 2
      OpenCVPCHSupport.cmake
  3. 2
      doc/CMakeLists.txt
  4. 2
      modules/gpu/CMakeLists.txt
  5. 22
      modules/haartraining/CMakeLists.txt
  6. 42
      modules/python/CMakeLists.txt
  7. 24
      modules/stitching/CMakeLists.txt
  8. 20
      modules/traincascade/CMakeLists.txt

14
CMakeLists.txt
Unescape View File

@ -9,8 +9,6 @@
# #
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
set(OPENCV_SOURCE_DIR ${CMAKE_SOURCE_DIR})
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
# Add these standard paths to the search paths for FIND_LIBRARY # Add these standard paths to the search paths for FIND_LIBRARY
@ -167,7 +165,7 @@ find_program(SVNVERSION_PATH svnversion)
mark_as_advanced(force SVNVERSION_PATH) mark_as_advanced(force SVNVERSION_PATH)
if(SVNVERSION_PATH) if(SVNVERSION_PATH)
message(STATUS "Extracting svn version, please wait...") message(STATUS "Extracting svn version, please wait...")
execute_process(COMMAND ${SVNVERSION_PATH} -n ${OPENCV_SOURCE_DIR} OUTPUT_VARIABLE SVNVERSION_RESULT) execute_process(COMMAND ${SVNVERSION_PATH} -n ${OpenCV_SOURCE_DIR} OUTPUT_VARIABLE SVNVERSION_RESULT)
if(SVNVERSION_RESULT MATCHES "exported") if(SVNVERSION_RESULT MATCHES "exported")
# This is NOT a svn repository: # This is NOT a svn repository:
@ -557,7 +555,7 @@ endif()
if (ANDROID) if (ANDROID)
#android camera support #android camera support
set(NativeCamera_DIR "${OPENCV_SOURCE_DIR}/android/native-camera/build") set(NativeCamera_DIR "${OpenCV_SOURCE_DIR}/android/native-camera/build")
FIND_PACKAGE(NativeCamera QUIET) FIND_PACKAGE(NativeCamera QUIET)
if(NativeCamera_FOUND) if(NativeCamera_FOUND)
set(HAVE_ANDROID_NATIVE_CAMERA TRUE) set(HAVE_ANDROID_NATIVE_CAMERA TRUE)
@ -733,8 +731,8 @@ endif(WITH_TBB)
#Threading Framework -- temporary decision for ARM-s instead of TBB #Threading Framework -- temporary decision for ARM-s instead of TBB
if (NOT HAVE_TBB) if (NOT HAVE_TBB)
file(GLOB THREADING_FRAMEWORK_HEADER "${OPENCV_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp") file(GLOB THREADING_FRAMEWORK_HEADER "${OpenCV_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp")
file(GLOB THREADING_FRAMEWORK_SOURCE "${OPENCV_SOURCE_DIR}/modules/core/src/threading_framework.cpp") file(GLOB THREADING_FRAMEWORK_SOURCE "${OpenCV_SOURCE_DIR}/modules/core/src/threading_framework.cpp")
if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE) if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE)
set(HAVE_THREADING_FRAMEWORK 1) set(HAVE_THREADING_FRAMEWORK 1)
endif() endif()
@ -864,11 +862,11 @@ if(WIN32)
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS)
if (MSVC64) if (MSVC64)
if(HAVE_VIDEOINPUT) if(HAVE_VIDEOINPUT)
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENCV_SOURCE_DIR}/3rdparty/lib/videoInput64.lib strmiids) set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OpenCV_SOURCE_DIR}/3rdparty/lib/videoInput64.lib strmiids)
endif() endif()
elseif (MSVC) elseif (MSVC)
if(HAVE_VIDEOINPUT) if(HAVE_VIDEOINPUT)
set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENCV_SOURCE_DIR}/3rdparty/lib/videoInput.lib strmiids) set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OpenCV_SOURCE_DIR}/3rdparty/lib/videoInput.lib strmiids)
endif() endif()
endif() endif()
endif() endif()

2
OpenCVPCHSupport.cmake
Unescape View File

@ -57,7 +57,7 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ENDFOREACH(item) ENDFOREACH(item)
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${OPENCV_SOURCE_DIR} DEFINITIONS) GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${OpenCV_SOURCE_DIR} DEFINITIONS)
#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" ) #MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
LIST(APPEND ${_out_compile_flags} ${_directory_flags}) LIST(APPEND ${_out_compile_flags} ${_directory_flags})
LIST(APPEND ${_out_compile_flags} ${_global_definitions}) LIST(APPEND ${_out_compile_flags} ${_global_definitions})

2
doc/CMakeLists.txt
Unescape View File

@ -76,7 +76,7 @@ set(DOXYGEN_SOURCE_DIR)
set(doxy_html_dep_list) set(doxy_html_dep_list)
foreach(m ${module_names}) foreach(m ${module_names})
set(module_hdr_path "${OPENCV_SOURCE_DIR}/modules/${m}/include/opencv2/${m}") set(module_hdr_path "${OpenCV_SOURCE_DIR}/modules/${m}/include/opencv2/${m}")
set(DOXYGEN_SOURCE_DIR ${DOXYGEN_SOURCE_DIR} ${module_hdr_path}) set(DOXYGEN_SOURCE_DIR ${DOXYGEN_SOURCE_DIR} ${module_hdr_path})
file(GLOB module_hdrs "${module_hdr_path}/*.h*") file(GLOB module_hdrs "${module_hdr_path}/*.h*")
set(doxy_html_dep_list ${doxy_html_dep_list} ${module_hdrs}) set(doxy_html_dep_list ${doxy_html_dep_list} ${module_hdrs})

2
modules/gpu/CMakeLists.txt
Unescape View File

@ -194,7 +194,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
source_group("Src" FILES ${test_hdrs} ${test_srcs}) source_group("Src" FILES ${test_hdrs} ${test_srcs})
if(HAVE_CUDA) 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*") file(GLOB nvidia "test/nvidia/*.cpp" "test/nvidia/*.h*")
source_group("Src\\NVidia" FILES ${nvidia}) source_group("Src\\NVidia" FILES ${nvidia})

22
modules/haartraining/CMakeLists.txt
Unescape View File

@ -2,20 +2,20 @@ project(haartraining)
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include" "${OpenCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include" "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include" "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include" "${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include" "${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include" "${OpenCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include" "${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include" "${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include" "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include" "${OpenCV_SOURCE_DIR}/modules/legacy/include"
) )
if(WIN32) 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() endif()
set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine) set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)

42
modules/python/CMakeLists.txt
Unescape View File

@ -7,31 +7,31 @@ include_directories(${PYTHON_INCLUDE_PATH})
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}/src1" "${CMAKE_CURRENT_SOURCE_DIR}/src1"
"${CMAKE_CURRENT_SOURCE_DIR}/src2" "${CMAKE_CURRENT_SOURCE_DIR}/src2"
"${OPENCV_SOURCE_DIR}/modules/core/include" "${OpenCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include" "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/video/include" "${OpenCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include" "${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include" "${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include" "${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include" "${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include" "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include" "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include" "${OpenCV_SOURCE_DIR}/modules/legacy/include"
"${OPENCV_SOURCE_DIR}/modules/contrib/include" "${OpenCV_SOURCE_DIR}/modules/contrib/include"
) )
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(opencv_hdrs "${OPENCV_SOURCE_DIR}/modules/core/include/opencv2/core/core.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/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/background_segm.hpp"
"${OPENCV_SOURCE_DIR}/modules/video/include/opencv2/video/tracking.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/highgui/include/opencv2/highgui/highgui.hpp"
"${OPENCV_SOURCE_DIR}/modules/ml/include/opencv2/ml/ml.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/features2d/include/opencv2/features2d/features2d.hpp"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include/opencv2/calib3d/calib3d.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/objdetect/include/opencv2/objdetect/objdetect.hpp"
"${OPENCV_SOURCE_DIR}/modules/python/src2/opencv_extra_api.hpp") "${OpenCV_SOURCE_DIR}/modules/python/src2/opencv_extra_api.hpp")
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")

24
modules/stitching/CMakeLists.txt
Unescape View File

@ -2,18 +2,18 @@ project(stitching)
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include" "${OpenCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include" "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include" "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include" "${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include" "${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include" "${OpenCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include" "${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include" "${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include" "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include" "${OpenCV_SOURCE_DIR}/modules/legacy/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/src" # for gcgraph.hpp "${OpenCV_SOURCE_DIR}/modules/imgproc/src" # for gcgraph.hpp
"${OPENCV_SOURCE_DIR}/modules/gpu/include" "${OpenCV_SOURCE_DIR}/modules/gpu/include"
) )
set(stitching_libs opencv_core opencv_imgproc opencv_highgui opencv_features2d opencv_calib3d opencv_gpu) set(stitching_libs opencv_core opencv_imgproc opencv_highgui opencv_features2d opencv_calib3d opencv_gpu)

20
modules/traincascade/CMakeLists.txt
Unescape View File

@ -2,16 +2,16 @@ project(traincascade)
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${OPENCV_SOURCE_DIR}/modules/core/include" "${OpenCV_SOURCE_DIR}/modules/core/include"
"${OPENCV_SOURCE_DIR}/modules/imgproc/include" "${OpenCV_SOURCE_DIR}/modules/imgproc/include"
"${OPENCV_SOURCE_DIR}/modules/objdetect/include" "${OpenCV_SOURCE_DIR}/modules/objdetect/include"
"${OPENCV_SOURCE_DIR}/modules/ml/include" "${OpenCV_SOURCE_DIR}/modules/ml/include"
"${OPENCV_SOURCE_DIR}/modules/highgui/include" "${OpenCV_SOURCE_DIR}/modules/highgui/include"
"${OPENCV_SOURCE_DIR}/modules/video/include" "${OpenCV_SOURCE_DIR}/modules/video/include"
"${OPENCV_SOURCE_DIR}/modules/features2d/include" "${OpenCV_SOURCE_DIR}/modules/features2d/include"
"${OPENCV_SOURCE_DIR}/modules/flann/include" "${OpenCV_SOURCE_DIR}/modules/flann/include"
"${OPENCV_SOURCE_DIR}/modules/calib3d/include" "${OpenCV_SOURCE_DIR}/modules/calib3d/include"
"${OPENCV_SOURCE_DIR}/modules/legacy/include" "${OpenCV_SOURCE_DIR}/modules/legacy/include"
) )
set(traincascade_libs opencv_core opencv_ml opencv_imgproc set(traincascade_libs opencv_core opencv_ml opencv_imgproc

Write Preview
Loading…
Cancel
Save