From 2ff515c465020a9953110be2069cf89d0ec410f4 Mon Sep 17 00:00:00 2001

From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>

Date: Tue, 15 Dec 2020 19:00:45 +0300

Subject: [PATCH] ALT: compiler flags

---

 conky/cmake/ConkyBuildOptions.cmake | 11 ++---------

 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/conky/cmake/ConkyBuildOptions.cmake b/conky/cmake/ConkyBuildOptions.cmake

index 9e9826f9..0500c3d0 100644

--- a/conky/cmake/ConkyBuildOptions.cmake

+++ b/conky/cmake/ConkyBuildOptions.cmake

@@ -36,13 +36,6 @@ if(NOT CMAKE_BUILD_TYPE)

   endif(MAINTAINER_MODE)

 endif(NOT CMAKE_BUILD_TYPE)

-# -std options for all build types

-set(CMAKE_C_FLAGS "-std=c99"

-    CACHE STRING "Flags used by the C compiler during all build types."

-    FORCE)

-set(CMAKE_CXX_FLAGS "-std=c++17"

-    CACHE STRING "Flags used by the C++ compiler during all build types."

-    FORCE)

 set(CMAKE_CXX_STANDARD 17)

 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 set(CMAKE_CXX_EXTENSIONS ON)

@@ -60,7 +53,7 @@ if(MAINTAINER_MODE)

       FORCE)

     set(

       CMAKE_CXX_FLAGS_DEBUG

-      "-ggdb -Wall -W -Wextra -Wunused -pedantic -Werror -Wno-format -Wno-unknown-pragmas -Wno-error=pragmas -Wimplicit-fallthrough=2"

+      "-ggdb -Wall -W -Wextra -Wunused -Werror -Wno-unknown-pragmas -Wno-error=pragmas -Wimplicit-fallthrough=2"

       CACHE STRING "Flags used by the compiler during debug builds."

       FORCE)

   else()

@@ -71,7 +64,7 @@ if(MAINTAINER_MODE)

       FORCE)

     set(

       CMAKE_CXX_FLAGS_DEBUG

-      "-ggdb -Wall -W -Wextra -Wunused -pedantic -Werror -Wno-format -Wno-unknown-pragmas -Wno-error=pragmas"

+      "-ggdb -Wall -W -Wextra -Wunused -Werror -Wno-unknown-pragmas -Wno-error=pragmas"

       CACHE STRING "Flags used by the compiler during debug builds."

       FORCE)

   endif()

-- 

2.29.2