From 16b2970bd720265442d4e67a2e6cce889b8e2cbe Mon Sep 17 00:00:00 2001 From: patrick96 Date: Tue, 22 Dec 2020 01:58:21 +0100 Subject: [PATCH] build: Bump cmake version to 3.5.0 This includes the changes from polybar/xpp#30 which also updates the minimum cmake version in the xpp submodule --- CHANGELOG.md | 3 +++ CMakeLists.txt | 2 +- cmake/modules/FindXcb.cmake | 7 ------- doc/CMakeLists.txt | 2 +- lib/xpp | 2 +- tests/CMakeLists.txt.in | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fc56c82..dd080cb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 This does not affect you unless you are producing your own formatting tags (for example in a script) and you are using one of these invalid tags. +### Build +- Bump the minimum cmake version to 3.5 + ### Added - Warn states for the cpu, memory, fs, and battery modules. ([`#570`](https://github.com/polybar/polybar/issues/570), diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bb080f4..8d1395ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # # Build configuration # -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) # Enable ccache by default and as early as possible because project() performs # checks on the compiler diff --git a/cmake/modules/FindXcb.cmake b/cmake/modules/FindXcb.cmake index 8ebf1aef..efc7bb90 100644 --- a/cmake/modules/FindXcb.cmake +++ b/cmake/modules/FindXcb.cmake @@ -32,12 +32,8 @@ endforeach() set(XCB_XRM_header "xcb/xcb_xrm.h") set(XCB_CURSOR_header "xcb/xcb_cursor.h") -cmake_policy(PUSH) -cmake_policy(SET CMP0057 NEW) - foreach(_comp ${Xcb_FIND_COMPONENTS}) if (NOT ${_comp} IN_LIST XCB_known_components) - cmake_policy(POP) message(FATAL_ERROR "Unknow component \"${_comp}\" of XCB") endif() @@ -58,9 +54,6 @@ foreach(_comp ${Xcb_FIND_COMPONENTS}) if(Xcb_${_comp}_FOUND AND NOT TARGET Xcb::${_comp}) create_imported_target("Xcb::${_comp}" "${Xcb_${_comp}_INCLUDE_DIRS}" "${Xcb_${_comp}_LIBRARIES}") elseif(NOT Xcb_${_comp}_FOUND AND Xcb_FIND_REQUIRED) - cmake_policy(POP) message(FATAL_ERROR "Xcb: Required component \"${_comp}\" is not found") endif() endforeach() - -cmake_policy(POP) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index fb8ad29b..9806c554 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) # Only used if documentation is built on its own project(polybar-doc NONE) diff --git a/lib/xpp b/lib/xpp index 044e69d0..4d67025c 160000 --- a/lib/xpp +++ b/lib/xpp @@ -1 +1 @@ -Subproject commit 044e69d05db7f89339bda1ccd1efe0263b01c8f6 +Subproject commit 4d67025cdbcc7f3c65d1a620c97a8443e0a08129 diff --git a/tests/CMakeLists.txt.in b/tests/CMakeLists.txt.in index 2b04f916..64866db7 100644 --- a/tests/CMakeLists.txt.in +++ b/tests/CMakeLists.txt.in @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) project(googletest-download NONE)