From 95dad5bb0bd3fbf5e1a0f8cfb10b3c89c17c2ca4 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Sun, 23 Aug 2026 15:47:10 -0400 Subject: [PATCH] cmake : Clean up CMake developer warnings Modernize deprecated CMake usage and correct package-name mismatches reported by newer CMake versions. Replace exec_program() with execute_process(), use PkgConfig through find_package() while retaining fallback discovery, and align find_package_handle_standard_args() names with their corresponding find_package() calls. This removes most CMake developer warnings without changing the intended dependency discovery behavior. Signed-off-by: Robin Getz --- CMakeLists.txt | 1 + cmake/Modules/FindAptDec.cmake | 8 +++++--- cmake/Modules/FindFAAD.cmake | 6 ++++-- cmake/Modules/FindFFTW3F.cmake | 6 ++++-- cmake/Modules/FindFLAC.cmake | 6 ++++-- cmake/Modules/FindGGMorse.cmake | 8 +++++--- cmake/Modules/FindHamlib.cmake | 2 +- cmake/Modules/FindLibDAB.cmake | 6 ++++-- cmake/Modules/FindRNnoise.cmake | 8 +++++--- cmake/Modules/FindSDRplay.cmake | 2 +- cmake/Modules/FindSgp4.cmake | 8 +++++--- cmake/Modules/FindUHD.cmake | 6 ++++-- cmake/cpack/CMakeLists.txt | 8 +++++++- 13 files changed, 50 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c4d464e8..17ec6ed94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +message(STATUS "cmake version: ${CMAKE_VERSION}") cmake_minimum_required(VERSION 3.17.0) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") diff --git a/cmake/Modules/FindAptDec.cmake b/cmake/Modules/FindAptDec.cmake index 5443a4f1f..29341f03e 100644 --- a/cmake/Modules/FindAptDec.cmake +++ b/cmake/Modules/FindAptDec.cmake @@ -1,6 +1,8 @@ IF(NOT APT_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_APT apt) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_APT apt) + endif() FIND_PATH( APT_INCLUDE_DIR @@ -23,7 +25,7 @@ IF(NOT APT_FOUND) message(STATUS "APT INCLUDE DIRS " ${APT_INCLUDE_DIR}) INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(APT DEFAULT_MSG APT_LIBRARIES APT_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(AptDec DEFAULT_MSG APT_LIBRARIES APT_INCLUDE_DIR) MARK_AS_ADVANCED(APT_LIBRARIES APT_INCLUDE_DIR) ENDIF(NOT APT_FOUND) diff --git a/cmake/Modules/FindFAAD.cmake b/cmake/Modules/FindFAAD.cmake index 249f0c98e..733b5cc06 100644 --- a/cmake/Modules/FindFAAD.cmake +++ b/cmake/Modules/FindFAAD.cmake @@ -1,6 +1,8 @@ IF(NOT FAAD_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_FAAD faad2) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_FAAD faad2) + endif() FIND_PATH( FAAD_INCLUDE_DIR diff --git a/cmake/Modules/FindFFTW3F.cmake b/cmake/Modules/FindFFTW3F.cmake index 504034173..bfa249ef6 100644 --- a/cmake/Modules/FindFFTW3F.cmake +++ b/cmake/Modules/FindFFTW3F.cmake @@ -3,8 +3,10 @@ # Find single-precision (float) version of FFTW3 -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_FFTW3F "fftw3f >= 3.0") +find_package(PkgConfig) +if (PkgConfig_FOUND) + pkg_check_modules(PC_FFTW3F fftw3f>=3.0) +endif() FIND_PATH( FFTW3F_INCLUDE_DIRS diff --git a/cmake/Modules/FindFLAC.cmake b/cmake/Modules/FindFLAC.cmake index e75f67b62..965276235 100644 --- a/cmake/Modules/FindFLAC.cmake +++ b/cmake/Modules/FindFLAC.cmake @@ -1,6 +1,8 @@ IF(NOT FLAC_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_FLAC flac) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_FLAC flac) + endif() FIND_PATH( FLAC_INCLUDE_DIR diff --git a/cmake/Modules/FindGGMorse.cmake b/cmake/Modules/FindGGMorse.cmake index 08c158264..ce2ae5c07 100644 --- a/cmake/Modules/FindGGMorse.cmake +++ b/cmake/Modules/FindGGMorse.cmake @@ -1,6 +1,8 @@ if (NOT GGMORSE_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_GGMorse "libggmorse") + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_GGMorse "libggmorse") + endif() FIND_PATH(GGMORSE_INCLUDE_DIR NAMES ggmorse/ggmorse.h @@ -33,6 +35,6 @@ if (NOT GGMORSE_FOUND) endif (GGMORSE_INCLUDE_DIR AND GGMORSE_LIBRARIES) INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GGMORSE DEFAULT_MSG GGMORSE_LIBRARIES GGMORSE_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(GGMorse DEFAULT_MSG GGMORSE_LIBRARIES GGMORSE_INCLUDE_DIR) MARK_AS_ADVANCED(GGMORSE_LIBRARIES GGMORSE_INCLUDE_DIR) endif (NOT GGMORSE_FOUND) diff --git a/cmake/Modules/FindHamlib.cmake b/cmake/Modules/FindHamlib.cmake index 64517d1d7..6af8c1e0a 100644 --- a/cmake/Modules/FindHamlib.cmake +++ b/cmake/Modules/FindHamlib.cmake @@ -43,7 +43,7 @@ if (NOT hamlib_FOUND) endif() INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(HAMLIB DEFAULT_MSG hamlib_LIBRARIES hamlib_INCLUDE_DIRS) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Hamlib DEFAULT_MSG hamlib_LIBRARIES hamlib_INCLUDE_DIRS) MARK_AS_ADVANCED(hamlib_LIBRARIES hamlib_INCLUDE_DIRS) endif (NOT hamlib_FOUND) diff --git a/cmake/Modules/FindLibDAB.cmake b/cmake/Modules/FindLibDAB.cmake index e419bb6ec..3c2f00147 100644 --- a/cmake/Modules/FindLibDAB.cmake +++ b/cmake/Modules/FindLibDAB.cmake @@ -1,6 +1,8 @@ IF (NOT DAB_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(LIBDAB_PKG libdab) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(LIBDAB_PKG libdab) + endif() FIND_PATH( DAB_INCLUDE_DIR diff --git a/cmake/Modules/FindRNnoise.cmake b/cmake/Modules/FindRNnoise.cmake index 92e846a35..ce3a12ca7 100644 --- a/cmake/Modules/FindRNnoise.cmake +++ b/cmake/Modules/FindRNnoise.cmake @@ -1,6 +1,8 @@ if (NOT RNNOISE_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_RNNoise "librnnoise") + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_RNNoise "librnnoise") + endif() FIND_PATH(RNNOISE_INCLUDE_DIR NAMES rnnoise.h @@ -33,6 +35,6 @@ if (NOT RNNOISE_FOUND) endif (RNNOISE_INCLUDE_DIR AND RNNOISE_LIBRARIES) INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(RNNoise DEFAULT_MSG RNNOISE_LIBRARIES RNNOISE_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(RNnoise DEFAULT_MSG RNNOISE_LIBRARIES RNNOISE_INCLUDE_DIR) MARK_AS_ADVANCED(RNNOISE_LIBRARIES RNNOISE_INCLUDE_DIR) endif (NOT RNNOISE_FOUND) diff --git a/cmake/Modules/FindSDRplay.cmake b/cmake/Modules/FindSDRplay.cmake index 226d8977a..95ae809cb 100644 --- a/cmake/Modules/FindSDRplay.cmake +++ b/cmake/Modules/FindSDRplay.cmake @@ -21,7 +21,7 @@ IF(NOT SDRPLAY_FOUND) message(STATUS "SDRPLAY INCLUDE DIRS " ${SDRPLAY_INCLUDE_DIR}) INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDRPLAY DEFAULT_MSG SDRPLAY_LIBRARIES SDRPLAY_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDRplay DEFAULT_MSG SDRPLAY_LIBRARIES SDRPLAY_INCLUDE_DIR) MARK_AS_ADVANCED(SDRPLAY_LIBRARIES SDRPLAY_INCLUDE_DIR) ENDIF(NOT SDRPLAY_FOUND) diff --git a/cmake/Modules/FindSgp4.cmake b/cmake/Modules/FindSgp4.cmake index 708e4cbae..3049aa9d0 100644 --- a/cmake/Modules/FindSgp4.cmake +++ b/cmake/Modules/FindSgp4.cmake @@ -1,6 +1,8 @@ IF(NOT SGP4_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_SGP4 sgp4) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_SGP4 sgp4) + endif() FIND_PATH( SGP4_INCLUDE_DIR @@ -23,7 +25,7 @@ IF(NOT SGP4_FOUND) message(STATUS "SGP4 INCLUDE DIRS " ${SGP4_INCLUDE_DIR}) INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(SGP4 DEFAULT_MSG SGP4_LIBRARIES SGP4_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sgp4 DEFAULT_MSG SGP4_LIBRARIES SGP4_INCLUDE_DIR) MARK_AS_ADVANCED(SGP4_LIBRARIES SGP4_INCLUDE_DIR) ENDIF(NOT SGP4_FOUND) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 76d62b21b..62e6d8b13 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -1,6 +1,8 @@ IF(NOT UHD_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_UHD uhd) + find_package(PkgConfig) + if(PkgConfig_FOUND) + PKG_CHECK_MODULES(PC_UHD uhd) + endif() FIND_PATH( UHD_INCLUDE_DIR diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt index 932caec17..e8ff38b3f 100644 --- a/cmake/cpack/CMakeLists.txt +++ b/cmake/cpack/CMakeLists.txt @@ -1,7 +1,13 @@ # Stuff qmake can tell us get_target_property (QMAKE_EXECUTABLE Qt::qmake LOCATION) + function (QUERY_QMAKE VAR RESULT) - exec_program (${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output) + execute_process( + COMMAND "${QMAKE_EXECUTABLE}" -query "${VAR}" + RESULT_VARIABLE return_code + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) if (NOT return_code) file (TO_CMAKE_PATH "${output}" output) set (${RESULT} ${output} PARENT_SCOPE)