diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-11 20:28:01 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-16 20:55:16 +0300 |
| commit | b9c85d6b0e274bf0a6287cd56d9e3d7376b0d004 (patch) | |
| tree | 382838fe1e22a48addbd3fe65f0a0167a213f820 /src/android/jar | |
| parent | 581ac9a4add648412a220ee3edc3553c9edae06d (diff) | |
CMake: build add flags for building QtAndroid.jar
Adds -source, -target, -Xlint:unchecked, -bootclasspath flags.
Setting default javac build source and target versions to 8.
Allow setting custom values for javac build versions via
-DQT_ANDROID_JAVAC_SOURCE, and -DQT_ANDROID_JAVAC_TARGET.
Task-number: QTBUG-86282
Change-Id: I98f4f193ac96016dc722d178594d7fd401202f68
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/android/jar')
| -rw-r--r-- | src/android/jar/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/android/jar/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt index e09f318aac..bff97e90ef 100644 --- a/src/android/jar/.prev_CMakeLists.txt +++ b/src/android/jar/.prev_CMakeLists.txt @@ -18,7 +18,7 @@ set(java_sources src/org/qtproject/qt5/android//QtThread.java ) -add_jar(QtAndroid +qt_internal_add_jar(QtAndroid INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index c8beeba96d..0fb666bcb3 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -19,7 +19,7 @@ set(java_sources src/org/qtproject/qt5/android/QtServiceDelegate.java # special case ) -add_jar(QtAndroid +qt_internal_add_jar(QtAndroid INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" |