generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OpenCVConfig.cmake is updated to export OpenCV_SOURCE_PATH when used without "make install"

Browse Source
This commit is contained in:
Andrey Kamaev 2011-09-14 09:11:14 +00:00
parent be8e31f14d
commit 255617ffe5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenCVConfig.cmake.in
View File

@ -28,6 +28,7 @@
# - OpenCV_EXTRA_COMPONENTS # - OpenCV_EXTRA_COMPONENTS
# - OpenCV_USE_MANGLED_PATHS # - OpenCV_USE_MANGLED_PATHS
# - OpenCV_HAVE_ANDROID_CAMERA # - OpenCV_HAVE_ANDROID_CAMERA
# - OpenCV_SOURCE_PATH
# #
# ================================================================================================= # =================================================================================================
@ -128,11 +129,12 @@ endif()
# ============================================================== # ==============================================================
# Extra include directories, needed by OpenCV 2 new structure # Extra include directories, needed by OpenCV 2 new structure
# ============================================================== # ==============================================================
if(NOT "@CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE@" STREQUAL "") SET(OpenCV_SOURCE_PATH "@CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE@")
if(NOT "${OpenCV_SOURCE_PATH}" STREQUAL "")
foreach(__CVLIB ${OpenCV_LIB_COMPONENTS}) foreach(__CVLIB ${OpenCV_LIB_COMPONENTS})
# We only need the "core",... part here: "opencv_core" -> "core" # We only need the "core",... part here: "opencv_core" -> "core"
STRING(REGEX REPLACE "opencv_(.*)" "\\1" __MODNAME ${__CVLIB}) STRING(REGEX REPLACE "opencv_(.*)" "\\1" __MODNAME ${__CVLIB})
INCLUDE_DIRECTORIES("@CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE@/modules/${__MODNAME}/include") INCLUDE_DIRECTORIES("${OpenCV_SOURCE_PATH}/modules/${__MODNAME}/include")
endforeach() endforeach()
endif() endif()