Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 21:48:33 +00:00
Code Issues Releases Activity

Disable -Wregister on gperf output

Browse Source 
Older versions of gperf use the `register` keyword which is deprecated
in C++17, and warnings are treated as errors.

This disables the warning on gperf's output (colour-names.hh). I also
renamed `colour-names.cc` -> `colour-names.hh` because we're including
it as a header, not compiling it separately.

This resolves #1865.
This commit is contained in:
Brenden Matthews 2024-04-28 11:17:12 -04:00
parent b6b9b3666e
commit 7598b89960
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -23,7 +23,7 @@ data/defconfig.h
*.a *.a
/config.h /config.h
/build.h /build.h
src/colour-names.cc src/colour-names.hh
# Compiler cache # Compiler cache
.cache .cache

22
src/CMakeLists.txt
View File

@ -47,7 +47,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h)
) )
endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h) endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h)
# Generate colour-names.cc with gperf # Generate colour-names.hh with gperf
if(APP_GPERF) if(APP_GPERF)
execute_process( execute_process(
INPUT_FILE "${CMAKE_SOURCE_DIR}/data/color-names.yml" INPUT_FILE "${CMAKE_SOURCE_DIR}/data/color-names.yml"
@ -56,12 +56,13 @@ if(APP_GPERF)
) )
execute_process( execute_process(
INPUT_FILE "${CMAKE_BINARY_DIR}/data/color-names.gperf" INPUT_FILE "${CMAKE_BINARY_DIR}/data/color-names.gperf"
OUTPUT_FILE "${CMAKE_BINARY_DIR}/colour-names.cc" OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/colour-names.hh"
COMMAND ${APP_GPERF} --ignore-case -LC++ -Zcolor_name_hash -t -7 -m1 -C -E COMMAND ${APP_GPERF} --ignore-case -LC++ -Zcolor_name_hash -t -7 -m1 -C -E
) )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
else(APP_GPERF) else(APP_GPERF)
message(WARNING "'gperf' program not found, using stub colour-names.cc; colors names will not be parsed") message(WARNING "'gperf' program not found, using stub colour-names.hh; colors names will not be parsed")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/colour-names-stub.cc" "${CMAKE_BINARY_DIR}/colour-names.cc" COPYONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/colour-names-stub.hh" "${CMAKE_CURRENT_BINARY_DIR}/colour-names.hh" COPYONLY)
endif(APP_GPERF) endif(APP_GPERF)
set(conky_sources set(conky_sources
@ -253,7 +254,7 @@ endif(BUILD_HTTP)
if(BUILD_X11) if(BUILD_X11)
set(x11 set(x11
display-x11.cc display-x11.cc
display-x11.hh display-x11.hh
x11-settings.cc x11-settings.cc
x11-settings.h x11-settings.h
@ -274,11 +275,10 @@ if(BUILD_GUI)
endif(BUILD_MOUSE_EVENTS OR BUILD_XINPUT) endif(BUILD_MOUSE_EVENTS OR BUILD_XINPUT)
endif(BUILD_GUI) endif(BUILD_GUI)
if(BUILD_WAYLAND) if(BUILD_WAYLAND)
set(wl_srcs set(wl_srcs
wl.cc wl.cc
wl.h wl.h
display-wayland.cc display-wayland.cc
display-wayland.hh display-wayland.hh
xdg-shell-protocol.c xdg-shell-protocol.c
@ -356,10 +356,10 @@ endif(BUILD_ICONV)
if(BUILD_NCURSES) if(BUILD_NCURSES)
set(ncurses_srcs set(ncurses_srcs
nc.cc nc.cc
nc.h nc.h
display-ncurses.cc display-ncurses.cc
display-ncurses.hh display-ncurses.hh
) )
set(optional_sources ${optional_sources} ${ncurses_srcs}) set(optional_sources ${optional_sources} ${ncurses_srcs})
endif(BUILD_NCURSES) endif(BUILD_NCURSES)

2
src/colour-names-stub.cc → src/colour-names-stub.hh
View File

@ -1,5 +1,5 @@
/* /*
* To generate colour-names.cc, you must have gperf installed during build. * To generate colour-names.hh, you must have gperf installed during build.
* This is a dummy implementation for builds without gperf. * This is a dummy implementation for builds without gperf.
* Color name matching will always return null (i.e. no match). * Color name matching will always return null (i.e. no match).
*/ */

8
src/colours.cc
View File

@ -42,7 +42,13 @@ Colour Colour::from_argb32(uint32_t argb) {
return out; return out;
} }
#include "colour-names.cc" #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wregister"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wregister"
#include <colour-names.hh>
#pragma clang diagnostic pop
#pragma GCC diagnostic pop
std::optional<Colour> parse_color_name(const std::string &name) { std::optional<Colour> parse_color_name(const std::string &name) {
const rgb *value = color_name_hash::in_word_set(name.c_str(), name.length()); const rgb *value = color_name_hash::in_word_set(name.c_str(), name.length());