mirror of
https://github.com/opencv/opencv.git
synced 2024-11-25 11:40:44 +08:00
d486204a0d
* Remove a forward method in dnn::Layer * Add a test * Fix tests * Mark multiple dnn::Layer::finalize methods as deprecated * Replace back dnn's inputBlobs to vector of pointers * Remove Layer::forward_fallback from CV_OCL_RUN scopes
23 lines
687 B
CMake
23 lines
687 B
CMake
if(ANDROID)
|
|
ocv_update(OPENCV_JAVA_LIB_NAME_SUFFIX "${OPENCV_VERSION_MAJOR}")
|
|
ocv_update(JAVA_INSTALL_ROOT "sdk/java")
|
|
else()
|
|
ocv_update(OPENCV_JAVA_LIB_NAME_SUFFIX "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
|
|
endif()
|
|
|
|
if(MSVC)
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4996)
|
|
else()
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-declarations)
|
|
endif()
|
|
|
|
# get list of modules to wrap
|
|
# message(STATUS "Wrapped in java:")
|
|
set(OPENCV_JAVA_MODULES)
|
|
foreach(m ${OPENCV_MODULES_BUILD})
|
|
if (";${OPENCV_MODULE_${m}_WRAPPERS};" MATCHES ";java;" AND HAVE_${m})
|
|
list(APPEND OPENCV_JAVA_MODULES ${m})
|
|
#message(STATUS "\t${m}")
|
|
endif()
|
|
endforeach()
|