Skip to content

Commit cafa04f

Browse files
committed
Merge pull request opencv#20221 from komakai:java-at-function
2 parents fef84f6 + a8757df commit cafa04f

File tree

12 files changed

+612
-6
lines changed

12 files changed

+612
-6
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ OCV_OPTION(BUILD_ANDROID_SERVICE "Build OpenCV Manager for Google Play" OFF I
467467
OCV_OPTION(BUILD_CUDA_STUBS "Build CUDA modules stubs when no CUDA SDK" OFF IF (NOT APPLE_FRAMEWORK) )
468468
OCV_OPTION(BUILD_JAVA "Enable Java support" (ANDROID OR NOT CMAKE_CROSSCOMPILING) IF (ANDROID OR (NOT APPLE_FRAMEWORK AND NOT WINRT)) )
469469
OCV_OPTION(BUILD_OBJC "Enable Objective-C support" ON IF APPLE_FRAMEWORK )
470+
OCV_OPTION(BUILD_KOTLIN_EXTENSIONS "Build Kotlin extensions (Android)" ON IF ANDROID )
470471

471472
# OpenCV installation options
472473
# ===================================================

cmake/android/android_gradle_projects.cmake

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
set(ANDROID_GRADLE_PLUGIN_VERSION "3.2.1" CACHE STRING "Android Gradle Plugin version")
33
message(STATUS "Android Gradle Plugin version: ${ANDROID_GRADLE_PLUGIN_VERSION}")
44

5+
set(KOTLIN_PLUGIN_VERSION "1.4.10" CACHE STRING "Kotlin Plugin version")
6+
message(STATUS "kotlin Plugin version: ${KOTLIN_GRADLE_PLUGIN_VERSION}")
7+
8+
if(BUILD_KOTLIN_EXTENSIONS)
9+
set(KOTLIN_PLUGIN_DECLARATION "apply plugin: 'kotlin-android'" CACHE STRING "Kotlin Plugin version")
10+
set(KOTLIN_STD_LIB "implementation 'org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN_PLUGIN_VERSION}'" CACHE STRING "Kotlin Standard Library dependency")
11+
else()
12+
set(KOTLIN_PLUGIN_DECLARATION "" CACHE STRING "Kotlin Plugin version")
13+
set(KOTLIN_STD_LIB "" CACHE STRING "Kotlin Standard Library dependency")
14+
endif()
15+
516
set(GRADLE_VERSION "5.6.4" CACHE STRING "Gradle version")
617
message(STATUS "Gradle version: ${GRADLE_VERSION}")
718

0 commit comments

Comments
 (0)