From e694c3e3a00ae5dd65e7273fcc7f3d3f369a51c1 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@users.noreply.github.com>
Date: Sat, 17 Dec 2022 17:02:03 -0800
Subject: [PATCH] Use C++ (not C) warning flags for GTK client (#4395)

Use the opportunity to reduce duplication.
---
 CMakeLists.txt                       | 6 ++++++
 cli/CMakeLists.txt                   | 2 --
 daemon/CMakeLists.txt                | 2 --
 gtk/CMakeLists.txt                   | 1 -
 libtransmission/CMakeLists.txt       | 5 -----
 qt/CMakeLists.txt                    | 5 -----
 tests/libtransmission/CMakeLists.txt | 1 -
 utils/CMakeLists.txt                 | 2 --
 8 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bee0603b..3979e87e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,6 +603,12 @@ else()
     unset(CMAKE_REQUIRED_FLAGS)
 endif()
 
+string(REPLACE ";" "$<SEMICOLON>" C_WARNING_FLAGS_GENEX "${C_WARNING_FLAGS}")
+string(REPLACE ";" "$<SEMICOLON>" CXX_WARNING_FLAGS_GENEX "${CXX_WARNING_FLAGS}")
+add_compile_options(
+    $<$<COMPILE_LANGUAGE:C>:${C_WARNING_FLAGS_GENEX}>
+    $<$<COMPILE_LANGUAGE:CXX>:${CXX_WARNING_FLAGS_GENEX}>)
+
 ###
 
 include(LargeFileSupport)
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index c4a82bc9f..053518a1c 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(trcli)
 
-add_compile_options(${CXX_WARNING_FLAGS})
-
 include_directories(${CMAKE_SOURCE_DIR})
 
 tr_win32_app_info(${PROJECT_NAME}_WIN32_RC_FILE
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index a4d190369..41e8879c5 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -4,8 +4,6 @@ if(WITH_SYSTEMD)
     add_definitions(-DUSE_SYSTEMD)
 endif()
 
-add_compile_options(${CXX_WARNING_FLAGS})
-
 include_directories(
     ${CMAKE_SOURCE_DIR}
 )
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index b8c57881f..63b65d856 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -1,6 +1,5 @@
 project(trgtk)
 
-add_compile_options(${C_WARNING_FLAGS})
 if(ENABLE_WERROR)
     add_compile_options($<IF:$<CXX_COMPILER_ID:MSVC>,/WX,-Werror>)
 endif()
diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt
index 2aba15792..f4cddebb1 100644
--- a/libtransmission/CMakeLists.txt
+++ b/libtransmission/CMakeLists.txt
@@ -89,11 +89,6 @@ set(PROJECT_FILES
   webseed.cc
 )
 
-string(REPLACE ";" " " CXX_WARNING_FLAGS_STR "${CXX_WARNING_FLAGS}")
-foreach(FILE ${PROJECT_FILES})
-  set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "${CXX_WARNING_FLAGS_STR}")
-endforeach()
-
 set(THIRD_PARTY_FILES
   jsonsl.c
   wildmat.c
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 4df2ff1c0..5092eab63 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -57,11 +57,6 @@ set(${PROJECT_NAME}_SOURCES
     WatchDir.cc
 )
 
-string(REPLACE ";" " " CXX_WARNING_FLAGS_STR "${CXX_WARNING_FLAGS}")
-foreach(FILE ${${PROJECT_NAME}_SOURCES})
-    set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "${CXX_WARNING_FLAGS_STR}")
-endforeach()
-
 if (NOT ENABLE_QT_COM_INTEROP)
     set_source_files_properties(ComInteropHelper.cc PROPERTIES HEADER_FILE_ONLY ON)
 endif()
diff --git a/tests/libtransmission/CMakeLists.txt b/tests/libtransmission/CMakeLists.txt
index 134bf00bf..226132e4d 100644
--- a/tests/libtransmission/CMakeLists.txt
+++ b/tests/libtransmission/CMakeLists.txt
@@ -73,7 +73,6 @@ target_include_directories(libtransmission-test SYSTEM
 
 target_compile_options(libtransmission-test
     PRIVATE
-        ${CXX_WARNING_FLAGS}
         $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-Wno-sign-compare>) # patches welcomed
 
 target_link_libraries(libtransmission-test
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index c08de67e9..defda1416 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(trutils)
 
-add_compile_options(${CXX_WARNING_FLAGS})
-
 include_directories(
     ${CMAKE_SOURCE_DIR}
 )