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

OCV option ENABLE_DYNAMIC_CUDA mistake fix.

Browse Source
This commit is contained in:
Alexander Smorkalov 2013-12-23 14:42:00 +04:00
parent 58e7d9f32f
commit 51d3138dff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/OpenCVGenAndroidMK.cmake
View File

@ -19,10 +19,6 @@ if(ANDROID)
set(OPENCV_STATIC_LIBTYPE_CONFIGMAKE ${OPENCV_LIBTYPE_CONFIGMAKE}) set(OPENCV_STATIC_LIBTYPE_CONFIGMAKE ${OPENCV_LIBTYPE_CONFIGMAKE})
endif() endif()
if (HAVE_opencv_gpu)
set(OPENCV_PREBUILT_GPU_MODULE_CONFIGMAKE "on")
endif()
# setup lists of camera libs # setup lists of camera libs
foreach(abi ARMEABI ARMEABI_V7A X86 MIPS) foreach(abi ARMEABI ARMEABI_V7A X86 MIPS)
ANDROID_GET_ABI_RAWNAME(${abi} ndkabi) ANDROID_GET_ABI_RAWNAME(${abi} ndkabi)
@ -52,11 +48,16 @@ if(ANDROID)
set(OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE "") set(OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE "")
foreach(m ${OPENCV_MODULES_PUBLIC}) foreach(m ${OPENCV_MODULES_PUBLIC})
list(INSERT OPENCV_MODULES_CONFIGMAKE 0 ${${m}_MODULE_DEPS_${ocv_optkind}} ${m}) list(INSERT OPENCV_MODULES_CONFIGMAKE 0 ${${m}_MODULE_DEPS_${ocv_optkind}} ${m})
if(${m}_EXTRA_DEPS_${ocv_optkind} AND NOT ${m}_EXTRA_DEPS_${ocv_optkind} MATCHES "libcu.+$") if(${m}_EXTRA_DEPS_${ocv_optkind})
list(INSERT OPENCV_EXTRA_COMPONENTS_CONFIGMAKE 0 ${${m}_EXTRA_DEPS_${ocv_optkind}}) list(INSERT OPENCV_EXTRA_COMPONENTS_CONFIGMAKE 0 ${${m}_EXTRA_DEPS_${ocv_optkind}})
endif() endif()
endforeach() endforeach()
# remove CUDA runtime and NPP from regular deps
# it can be added seporately if needed.
ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libcu")
ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libnpp")
# split 3rdparty libs and modules # split 3rdparty libs and modules
foreach(mod ${OPENCV_MODULES_CONFIGMAKE}) foreach(mod ${OPENCV_MODULES_CONFIGMAKE})
if(NOT mod MATCHES "^opencv_.+$") if(NOT mod MATCHES "^opencv_.+$")

3
cmake/templates/OpenCV.mk.in
View File

@ -13,11 +13,10 @@ OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@ OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@ OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@
OPENCV_PREBUILT_GPU_MODULE:=@OPENCV_PREBUILT_GPU_MODULE_CONFIGMAKE@
OPENCV_USE_GPU_MODULE:= OPENCV_USE_GPU_MODULE:=
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(OPENCV_PREBUILT_GPU_MODULE),on) ifneq ($(findstring gpu,$(OPENCV_MODULES)),)
ifneq ($(CUDA_TOOLKIT_DIR),) ifneq ($(CUDA_TOOLKIT_DIR),)
OPENCV_USE_GPU_MODULE:=on OPENCV_USE_GPU_MODULE:=on
endif endif

2
modules/dynamicuda/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(NOT DYNAMIC_CUDA_SUPPORT) if(NOT ENABLE_DYNAMIC_CUDA)
ocv_module_disable(dynamicuda) ocv_module_disable(dynamicuda)
endif() endif()