From 2b9a582d3e37780d93e3ba2e97637198c88477e9 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 30 Sep 2023 14:43:15 +0100 Subject: [PATCH] Bump cmake requirements in subprojects too --- cmake/cxx11check/CMakeLists.txt | 2 +- cmake/perl_check/CMakeLists.txt | 2 +- src/CMakeLists.txt | 5 ----- test/integration/CMakeLists.txt | 2 +- znc-buildmod.cmake.in | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmake/cxx11check/CMakeLists.txt b/cmake/cxx11check/CMakeLists.txt index eef4b966..c9da4946 100644 --- a/cmake/cxx11check/CMakeLists.txt +++ b/cmake/cxx11check/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.13) project(cxx11check LANGUAGES CXX) set(CMAKE_VERBOSE_MAKEFILE true) diff --git a/cmake/perl_check/CMakeLists.txt b/cmake/perl_check/CMakeLists.txt index c8f02258..7ecf7504 100644 --- a/cmake/perl_check/CMakeLists.txt +++ b/cmake/perl_check/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.13) project(perl_check LANGUAGES CXX) set(CMAKE_VERBOSE_MAKEFILE true) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf919088..d9ef245c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,11 +14,6 @@ # limitations under the License. # -if(CMAKE_VERSION VERSION_LESS 3.2) - # Since 3.2 it does this automatically from BYPRODUCTS - set_source_files_properties("versionc.cpp" PROPERTIES GENERATED true) -endif() - set(znc_cpp "ZNCString.cpp" "znc.cpp" "IRCNetwork.cpp" "Translation.cpp" "IRCSock.cpp" "Client.cpp" "Chan.cpp" "Nick.cpp" "Server.cpp" "Modules.cpp" "MD5.cpp" "Buffer.cpp" "Utils.cpp" "FileUtils.cpp" diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 211998ea..5b16001f 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.13) project(ZNCIntegrationTest LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11) diff --git a/znc-buildmod.cmake.in b/znc-buildmod.cmake.in index 9645d060..aae49ede 100755 --- a/znc-buildmod.cmake.in +++ b/znc-buildmod.cmake.in @@ -56,7 +56,7 @@ args = parser.parse_args() with tempfile.TemporaryDirectory() as cmdir: with open(os.path.join(cmdir, 'CMakeLists.txt'), 'w') as cm: - print('cmake_minimum_required(VERSION 3.1)', file=cm) + print('cmake_minimum_required(VERSION 3.13)', file=cm) print('project(ExternalModules LANGUAGES CXX)', file=cm) print('find_package(ZNC @ZNC_VERSION_MAJOR@.@ZNC_VERSION_MINOR@ HINTS ' '@CMAKE_INSTALL_FULL_DATADIR@/znc REQUIRED)', file=cm)