Merge pull request #22839 from Rechi/cmake/various

[cmake] various fixes and cleanups

13 files changed, 12 insertions, 16 deletions

diff --git a/cmake/addons/CMakeLists.txt b/cmake/addons/CMakeLists.txt
index c1313d7458..74328e9158 100644
--- a/cmake/addons/CMakeLists.txt
+++ b/cmake/addons/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(kodi-addons)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
diff --git a/cmake/addons/bootstrap/CMakeLists.txt b/cmake/addons/bootstrap/CMakeLists.txt
index 66b7e3d16c..1e0ac9e78b 100644
--- a/cmake/addons/bootstrap/CMakeLists.txt
+++ b/cmake/addons/bootstrap/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.12)
 project(kodi-addons-bootstrap)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
diff --git a/cmake/addons/depends/CMakeLists.txt b/cmake/addons/depends/CMakeLists.txt
index 831e0ed74c..baba20bc60 100644
--- a/cmake/addons/depends/CMakeLists.txt
+++ b/cmake/addons/depends/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.12)
 project(kodi-addons-depends)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
diff --git a/cmake/addons/depends/windows/CMakeLists.txt b/cmake/addons/depends/windows/CMakeLists.txt
index c8739c08ec..ad2c7d3569 100644
--- a/cmake/addons/depends/windows/CMakeLists.txt
+++ b/cmake/addons/depends/windows/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.12)
 project(kodi-addons-depends-windows)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
diff --git a/cmake/modules/FindUdfread.cmake b/cmake/modules/FindUdfread.cmake
index 49ec2b4562..35c1d9d5ba 100644
--- a/cmake/modules/FindUdfread.cmake
+++ b/cmake/modules/FindUdfread.cmake
@@ -31,7 +31,7 @@ if(ENABLE_INTERNAL_UDFREAD)
   set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP udfread)
 else()
   if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_UDFREAD udfread>=1.0.0 QUIET)
+    pkg_search_module(PC_UDFREAD QUIET libudfread>=1.0.0 udfread>=1.0.0)
   endif()
 
   find_path(UDFREAD_INCLUDE_DIR NAMES udfread/udfread.h
diff --git a/cmake/modules/buildtools/FindCCache.cmake b/cmake/modules/buildtools/FindCCache.cmake
index 34238dc402..04d81e2535 100644
--- a/cmake/modules/buildtools/FindCCache.cmake
+++ b/cmake/modules/buildtools/FindCCache.cmake
@@ -22,8 +22,8 @@ find_package_handle_standard_args(CCache REQUIRED_VARS CCACHE_PROGRAM
 
 if(CCACHE_FOUND)
   # Supports Unix Makefiles, Ninja and Xcode
-  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
-  set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
+  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" PARENT_SCOPE)
+  set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" PARENT_SCOPE)
 
   file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n")
   file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n")
diff --git a/cmake/modules/buildtools/MOLD.cmake b/cmake/modules/buildtools/MOLD.cmake
index cb29ed1e95..d1ac35b3d5 100644
--- a/cmake/modules/buildtools/MOLD.cmake
+++ b/cmake/modules/buildtools/MOLD.cmake
@@ -1,5 +1,5 @@
 if(ENABLE_MOLD)
-  if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
     # GCC < 12 doesn't support -fuse-ld=mold, so we have to use tools prefix path
     # if mold is installed in a non-standard dir, users can set -DMOLD_PREFIX=/path/to/mold_install_prefix
     find_path(MOLD_PREFIX_DIR NAMES ld
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index 2fe85fe2f7..49ba396194 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -18,9 +18,6 @@ else()
     set(ARCH arm)
     set(NEON True)
     set(NEON_FLAGS "-mfpu=neon")
-    if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
-      set(NEON_FLAGS "${NEON_FLAGS} -mvectorize-with-neon-quad")
-    endif()
   elseif(CPU STREQUAL arm64-v8a)
     set(ARCH aarch64)
     set(NEON True)
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index bbe5ea0bb8..633f148347 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -144,7 +144,6 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay)
 endforeach()
 add_bundle_file(${ASS_LIBRARY} ${libdir} "")
 add_bundle_file(${SHAIRPLAY_LIBRARY} ${libdir} "")
-add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "")
 
 # Main targets from Makefile.in
 if(CPU MATCHES i686)
diff --git a/cmake/scripts/common/AddonHelpers.dox b/cmake/scripts/common/AddonHelpers.dox
index 522e0e724c..489e33b7ed 100644
--- a/cmake/scripts/common/AddonHelpers.dox
+++ b/cmake/scripts/common/AddonHelpers.dox
@@ -14,7 +14,7 @@ process the construction.
 <b>Here's a minimal example of the addon used for CMakeLists.txt:</b>
 
 ~~~~~~~~~~~~~{.cmake}
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(example.addon)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
index 4083483173..5fbed4d74c 100644
--- a/cmake/scripts/linux/ArchSetup.cmake
+++ b/cmake/scripts/linux/ArchSetup.cmake
@@ -83,7 +83,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
           set(NJOBS ${USE_LTO})
         endif()
 
-        if(CMAKE_COMPILER_IS_GNUCXX)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
           # GCC
           # Make sure we strip binaries in Release build
           set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
index 8ae97b98cb..2b300a59ca 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(ffmpeg)
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 
 if(ENABLE_CCACHE AND CCACHE_PROGRAM)
   set(ffmpeg_conf "--cc=${CCACHE_PROGRAM} ${CMAKE_C_COMPILER}"
diff --git a/xbmc/addons/kodi-dev-kit/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/CMakeLists.txt
index 4b539b24f6..565d537727 100644
--- a/xbmc/addons/kodi-dev-kit/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(kodi-dev-kit)
 
 include(cmake/test/abi-interface-test.cmake)