Update CMake behaviors.

The version here is like Android's targetSdkVersion: it controls bug compatibility sorts of things. Bump it up to the CMake version we're using so we get the modern behaviors.
android · May 13, 2024 · b8a54f8 · b8a54f8
1 parent de5f0f9
commit b8a54f8
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 40 deletions.
diff --git a/audio-echo/app/src/main/cpp/CMakeLists.txt b/audio-echo/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(echo LANGUAGES C CXX)
 
 add_library(echo

diff --git a/bitmap-plasma/app/src/main/cpp/CMakeLists.txt b/bitmap-plasma/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-unused-function")
 

diff --git a/camera/basic/src/main/cpp/CMakeLists.txt b/camera/basic/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 set(COMMON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../common)

diff --git a/camera/texture-view/src/main/cpp/CMakeLists.txt b/camera/texture-view/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 set(COMMON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../common)

diff --git a/display-p3/image-view/src/main/cpp/CMakeLists.txt b/display-p3/image-view/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 get_filename_component(THIRD_PARTY_LIB_DIR
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../third_party

diff --git a/endless-tunnel/app/src/main/cpp/CMakeLists.txt b/endless-tunnel/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # build native_app_glue as a static lib
 add_library(native_app_glue STATIC

diff --git a/exceptions/app/src/main/cpp/CMakeLists.txt b/exceptions/app/src/main/cpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # Declares and names the project.
 

diff --git a/gles3jni/app/src/main/cpp/CMakeLists.txt b/gles3jni/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 # set targetPlatform, will be passed in from gradle when this sample is completed
 # openGL Supportability
 # platform         status

diff --git a/hello-gl2/app/src/main/cpp/CMakeLists.txt b/hello-gl2/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # now build app's shared lib
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")

diff --git a/hello-jni/app/src/main/cpp/CMakeLists.txt b/hello-jni/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 project("hello-jni")
 

diff --git a/hello-jniCallback/app/src/main/cpp/CMakeLists.txt b/hello-jniCallback/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 add_library(hello-jnicallback SHARED
             hello-jnicallback.c)

diff --git a/hello-libs/app/src/main/cpp/CMakeLists.txt b/hello-libs/app/src/main/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # configure import libs
 set(distribution_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution)

diff --git a/hello-libs/gen-libs/src/main/cpp/CMakeLists.txt b/hello-libs/gen-libs/src/main/cpp/CMakeLists.txt
@@ -18,7 +18,7 @@
 # Generate one static lib and one shared lib, copy them into
 # ${project_dir}/distribution for other indepdendent applications
 # to use.
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 

diff --git a/hello-libs/gen-libs/src/main/cpp/gmath/CMakeLists.txt b/hello-libs/gen-libs/src/main/cpp/gmath/CMakeLists.txt
@@ -18,7 +18,7 @@
 # we could not delete the bin directory is because android studio would error out
 # when it checks target's existance. Only distribution place is used as import to app
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 

diff --git a/hello-libs/gen-libs/src/main/cpp/gperf/CMakeLists.txt b/hello-libs/gen-libs/src/main/cpp/gperf/CMakeLists.txt
@@ -18,7 +18,7 @@
 # remove it after build complete, so only the distribution place could be
 # used for application linking.
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 

diff --git a/hello-neon/app/src/main/cpp/CMakeLists.txt b/hello-neon/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # build cpufeatures as a static lib
 add_library(cpufeatures STATIC

diff --git a/hello-oboe/app/src/main/cpp/CMakeLists.txt b/hello-oboe/app/src/main/cpp/CMakeLists.txt
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(hello-oboe LANGUAGES CXX)
 
 # add oboe pre-release lib hosted at https://maven.google.com/web/index.html

diff --git a/hello-vulkan/app/src/main/cpp/CMakeLists.txt b/hello-vulkan/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
  limitations under the License.
 #]]
 
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(hellovkjni)
 
 # Include the GameActivity static lib to the project.

diff --git a/native-activity/app/src/main/cpp/CMakeLists.txt b/native-activity/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # build native_app_glue as a static lib
 set(${CMAKE_C_FLAGS}, "${CMAKE_C_FLAGS}")

diff --git a/native-audio/app/src/main/cpp/CMakeLists.txt b/native-audio/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
 

diff --git a/native-codec/app/src/main/cpp/CMakeLists.txt b/native-codec/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
 

diff --git a/native-media/app/src/main/cpp/CMakeLists.txt b/native-media/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -UNDEBUG")
 

diff --git a/native-midi/app/src/main/cpp/CMakeLists.txt b/native-midi/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(native_midi LANGUAGES C CXX)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -O0")

diff --git a/native-plasma/app/src/main/cpp/CMakeLists.txt b/native-plasma/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # build native_app_glue as a static lib
 add_library(native_app_glue STATIC

diff --git a/nn-samples/basic/src/main/cpp/CMakeLists.txt b/nn-samples/basic/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 add_library(basic
             SHARED

diff --git a/nn-samples/sequence/src/main/cpp/CMakeLists.txt b/nn-samples/sequence/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 add_library(sequence
         SHARED

diff --git a/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt b/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.22.1)
 project(app VERSION 1.0.0 LANGUAGES CXX)
 
 find_package(curl REQUIRED CONFIG)

diff --git a/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt b/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.22.1)
 project(app VERSION 1.0.0 LANGUAGES CXX)
 
 find_package(jsoncpp REQUIRED CONFIG)

diff --git a/prefab/prefab-publishing/mylibrary/src/main/cpp/CMakeLists.txt b/prefab/prefab-publishing/mylibrary/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.22.1)
 project(mylibrary VERSION 1.0.0 LANGUAGES CXX)
 
 add_library(mylibrary SHARED mylibrary.cpp)

diff --git a/san-angeles/app/src/main/cpp/CMakeLists.txt b/san-angeles/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  -Wall -Werror")
 add_definitions("-DANDROID_NDK -DDISABLE_IMPORTGL")

diff --git a/sanitizers/app/src/main/cpp/CMakeLists.txt b/sanitizers/app/src/main/cpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # Declares and names the project.
 

diff --git a/sensor-graph/accelerometer/src/main/cpp/CMakeLists.txt b/sensor-graph/accelerometer/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # TODO: Remove -Wno-unused-variable
 # That warning is ignore for now because those are release config only issues

diff --git a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(ChoreographerNativeActivity LANGUAGES C CXX)
 
 # set up common compile options

diff --git a/teapots/classic-teapot/src/main/cpp/CMakeLists.txt b/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(TeapotNativeActivity LANGUAGES C CXX)
 
 # set up common compile options

diff --git a/teapots/common/ndk_helper/CMakeLists.txt b/teapots/common/ndk_helper/CMakeLists.txt
@@ -1,5 +1,5 @@
 # build native_app_glue as a static lib
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 include(AndroidNdkModules)
 android_ndk_import_module_native_app_glue()

diff --git a/teapots/image-decoder/src/main/cpp/CMakeLists.txt b/teapots/image-decoder/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(ImageDecoderNativeActivity LANGUAGES C CXX)
 
 # set up common compile options

diff --git a/teapots/more-teapots/src/main/cpp/CMakeLists.txt b/teapots/more-teapots/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(MoreTeapotsNativeActivity LANGUAGES C CXX)
 
 # set up common compile options

diff --git a/teapots/textured-teapot/src/main/cpp/CMakeLists.txt b/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(TexturedTeapotNativeActivity LANGUAGES C CXX)
 
 # set up common compile options

diff --git a/unit-test/app/src/main/cpp/CMakeLists.txt b/unit-test/app/src/main/cpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 # Declares and names the project.
 

diff --git a/webp/view/src/main/cpp/CMakeLists.txt b/webp/view/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.22.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)