From 51dc4cdd42cc57072b4e9da3aa02029597d4676c Mon Sep 17 00:00:00 2001
From: Cristian Le <cristian.le@qt.io>
Date: Fri, 24 Jan 2025 17:52:24 +0100
Subject: [PATCH] Simplify genex expressions

Simplifications:
- `COMPILE_LANGUAGE` accepts comma-separated list since 3.15

Pick-to: 6.8 6.9
Change-Id: I4af316a463b5771bf5b37a6b4d77e41adba60977
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtInternalTargets.cmake           | 2 +-
 cmake/QtPrecompiledHeadersHelpers.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 87512332de1..958ba4f8c32 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -77,7 +77,7 @@ function(qt_internal_set_warnings_are_errors_flags target target_scope)
     # Apparently qmake only adds -Werror to CXX and OBJCXX files, not C files. We have to do the
     # same otherwise MinGW builds break when building 3rdparty\md4c\md4c.c (and probably on other
     # platforms too).
-    set(cxx_only_genex "$<OR:$<COMPILE_LANGUAGE:CXX>,$<COMPILE_LANGUAGE:OBJCXX>>")
+    set(cxx_only_genex "$<COMPILE_LANGUAGE:CXX,OBJCXX>")
     set(final_condition_genex "$<AND:${warnings_are_errors_enabled_genex},${cxx_only_genex}>")
     set(flags_generator_expression "$<${final_condition_genex}:${flags}>")
 
diff --git a/cmake/QtPrecompiledHeadersHelpers.cmake b/cmake/QtPrecompiledHeadersHelpers.cmake
index fe384134073..fa152e4447c 100644
--- a/cmake/QtPrecompiledHeadersHelpers.cmake
+++ b/cmake/QtPrecompiledHeadersHelpers.cmake
@@ -3,7 +3,7 @@
 
 function(qt_update_precompiled_header target precompiled_header)
     if (precompiled_header AND BUILD_WITH_PCH)
-        set_property(TARGET "${target}" APPEND PROPERTY "PRECOMPILE_HEADERS" "$<$<OR:$<COMPILE_LANGUAGE:CXX>,$<COMPILE_LANGUAGE:OBJCXX>>:${precompiled_header}>")
+        set_property(TARGET "${target}" APPEND PROPERTY "PRECOMPILE_HEADERS" "$<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${precompiled_header}>")
     endif()
 endfunction()