pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Bump cmake version to 3.5.0

Browse Source 
This includes the changes from polybar/xpp#30 which also updates the
minimum cmake version in the xpp submodule
This commit is contained in:
patrick96 2020-12-22 01:58:21 +01:00 committed by Patrick Ziegler
parent 7d1b265ef4
commit 16b2970bd7
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -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 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. (for example in a script) and you are using one of these invalid tags.
### Build
- Bump the minimum cmake version to 3.5
### Added ### Added
- Warn states for the cpu, memory, fs, and battery modules. - Warn states for the cpu, memory, fs, and battery modules.
([`#570`](https://github.com/polybar/polybar/issues/570), ([`#570`](https://github.com/polybar/polybar/issues/570),

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
# #
# Build configuration # 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 # Enable ccache by default and as early as possible because project() performs
# checks on the compiler # checks on the compiler

7
cmake/modules/FindXcb.cmake
View File

@ -32,12 +32,8 @@ endforeach()
set(XCB_XRM_header "xcb/xcb_xrm.h") set(XCB_XRM_header "xcb/xcb_xrm.h")
set(XCB_CURSOR_header "xcb/xcb_cursor.h") set(XCB_CURSOR_header "xcb/xcb_cursor.h")
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
foreach(_comp ${Xcb_FIND_COMPONENTS}) foreach(_comp ${Xcb_FIND_COMPONENTS})
if (NOT ${_comp} IN_LIST XCB_known_components) if (NOT ${_comp} IN_LIST XCB_known_components)
cmake_policy(POP)
message(FATAL_ERROR "Unknow component \"${_comp}\" of XCB") message(FATAL_ERROR "Unknow component \"${_comp}\" of XCB")
endif() endif()
@ -58,9 +54,6 @@ foreach(_comp ${Xcb_FIND_COMPONENTS})
if(Xcb_${_comp}_FOUND AND NOT TARGET Xcb::${_comp}) if(Xcb_${_comp}_FOUND AND NOT TARGET Xcb::${_comp})
create_imported_target("Xcb::${_comp}" "${Xcb_${_comp}_INCLUDE_DIRS}" "${Xcb_${_comp}_LIBRARIES}") create_imported_target("Xcb::${_comp}" "${Xcb_${_comp}_INCLUDE_DIRS}" "${Xcb_${_comp}_LIBRARIES}")
elseif(NOT Xcb_${_comp}_FOUND AND Xcb_FIND_REQUIRED) elseif(NOT Xcb_${_comp}_FOUND AND Xcb_FIND_REQUIRED)
cmake_policy(POP)
message(FATAL_ERROR "Xcb: Required component \"${_comp}\" is not found") message(FATAL_ERROR "Xcb: Required component \"${_comp}\" is not found")
endif() endif()
endforeach() endforeach()
cmake_policy(POP)

2
doc/CMakeLists.txt
View File

@ -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 # Only used if documentation is built on its own
project(polybar-doc NONE) project(polybar-doc NONE)

2
lib/xpp

@ -1 +1 @@
Subproject commit 044e69d05db7f89339bda1ccd1efe0263b01c8f6 Subproject commit 4d67025cdbcc7f3c65d1a620c97a8443e0a08129

2
tests/CMakeLists.txt.in
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
project(googletest-download NONE) project(googletest-download NONE)