From a2fc226a3127766ead65666e4b2c43af861831da Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Mon, 15 Apr 2024 01:32:58 +0200 Subject: [PATCH] cmake: Bump minimum required version to 3.13.5 CMake 2.8 was already deprecated some time ago, and newer CMake versions, such as 3.22.1, would report its use as a warning. CMake 3.13.5 is a reasonably stable version that is well supported among most distributions and implements resonable policies, such as CMP0077: https://cmake.org/cmake/help/latest/policy/CMP0077.html However, bumping to 3.13.5 caused CMP0053 to now trigger configuration errors on FindLibSndFile.cmake, as parentheses must now be escaped. Further reference on CMP0053 can be found at: https://cmake.org/cmake/help/latest/policy/CMP0053.html --- CMakeLists.txt | 2 +- cmake/FindLibSndFile.cmake | 8 ++++---- qatsh/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71387f3..8c4e547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(qatsh) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.13.5) # CMake Build options. if(NOT DEFINED CMAKE_BUILD_TYPE) diff --git a/cmake/FindLibSndFile.cmake b/cmake/FindLibSndFile.cmake index 817db79..69eb11b 100644 --- a/cmake/FindLibSndFile.cmake +++ b/cmake/FindLibSndFile.cmake @@ -23,8 +23,8 @@ FIND_PATH(LIBSNDFILE_INCLUDE_DIR /opt/local # DarwinPorts /opt/csw # Blastwave /opt - "$ENV{ProgramFiles}\\libsndfile" "$ENV{ProgramFiles(x86)}\\libsndfile" - "$ENV{ProgramFiles}\\Mega-Nerd\\libsndfile" "$ENV{ProgramFiles(x86)}\\Mega-Nerd\\libsndfile") + "$ENV{ProgramFiles}\\libsndfile" "$ENV{ProgramFiles\(x86\)}\\libsndfile" + "$ENV{ProgramFiles}\\Mega-Nerd\\libsndfile" "$ENV{ProgramFiles\(x86\)}\\Mega-Nerd\\libsndfile") #MESSAGE(STATUS "LIBSNDFILE_INCLUDE_DIR=${LIBSNDFILE_INCLUDE_DIR}") @@ -44,8 +44,8 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY /opt/local # DarwinPorts /opt/csw # Blastwave /opt - "$ENV{ProgramFiles}\\libsndfile" "$ENV{ProgramFiles(x86)}\\libsndfile" - "$ENV{ProgramFiles}\\Mega-Nerd\\libsndfile" "$ENV{ProgramFiles(x86)}\\Mega-Nerd\\libsndfile") + "$ENV{ProgramFiles}\\libsndfile" "$ENV{ProgramFiles\(x86\)}\\libsndfile" + "$ENV{ProgramFiles}\\Mega-Nerd\\libsndfile" "$ENV{ProgramFiles\(x86\)}\\Mega-Nerd\\libsndfile") #MESSAGE(STATUS "LIBSNDFILE_LIBRARY=${LIBSNDFILE_LIBRARY}") diff --git a/qatsh/CMakeLists.txt b/qatsh/CMakeLists.txt index 27090d1..627be0f 100644 --- a/qatsh/CMakeLists.txt +++ b/qatsh/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT QT4_FOUND) SET(OPTION_QT5 On) endif() if(OPTION_QT5) - cmake_minimum_required(VERSION 2.8.8) + cmake_minimum_required(VERSION 3.13.5) endif() if(OPTION_QT5)