CUDA warning fix/supporession for Android.

pull/2049/head
Alexander Smorkalov 11 years ago
parent 4aa9f83100
commit 1e038e2837
  1. 13
      modules/core/src/gpumat.cpp
  2. 2
      modules/dynamicuda/CMakeLists.txt

@ -68,6 +68,19 @@
#endif #endif
#ifdef ANDROID #ifdef ANDROID
# ifdef LOG_TAG
# undef LOG_TAG
# endif
# ifdef LOGE
# undef LOGE
# endif
# ifdef LOGD
# undef LOGD
# endif
# ifdef LOGI
# undef LOGI
# endif
# include <android/log.h> # include <android/log.h>
# define LOG_TAG "OpenCV::CUDA" # define LOG_TAG "OpenCV::CUDA"

@ -5,7 +5,7 @@ endif()
set(the_description "Dynamic CUDA linkage") set(the_description "Dynamic CUDA linkage")
add_definitions(-DUSE_CUDA) add_definitions(-DUSE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wshadow)
ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include") ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
set(OPENCV_MODULE_TYPE SHARED) set(OPENCV_MODULE_TYPE SHARED)
if (BUILD_FAT_JAVA_LIB) if (BUILD_FAT_JAVA_LIB)

Loading…
Cancel
Save