From da2b0307f8dd563be5874cabe3290c073365f761 Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amir.abdol@qt.io>
Date: Wed, 29 Mar 2023 11:40:49 +0200
Subject: Replace STREQUAL cases with variable checks

As I was investigating the NO_UNITY_BUILD_SOURCES issue, I realized that
we don't need to pass these quoted, especially now that we have moved
to `cmake_parse_arguments(PARSE_ARGV`, and we can check their existence
just by checking the `arg_*`, and that should be sufficient.

I also left a warning that we are aware of this.

Pick-to: 6.5
Change-Id: I4d939e80dc4671ea3ae9dc61516279f69ba2c5a5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtAppHelpers.cmake        | 12 +++++++-----
 cmake/QtExecutableHelpers.cmake |  6 +++---
 cmake/QtTargetHelpers.cmake     | 10 +++++-----
 cmake/QtToolHelpers.cmake       | 12 +++++++-----
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake
index cfc3724558..4be5c7d5fe 100644
--- a/cmake/QtAppHelpers.cmake
+++ b/cmake/QtAppHelpers.cmake
@@ -68,11 +68,13 @@ function(qt_internal_add_app target)
         MOC_OPTIONS ${arg_MOC_OPTIONS}
         ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
         DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
-        TARGET_VERSION "${arg_TARGET_VERSION}"
-        TARGET_PRODUCT "${arg_TARGET_PRODUCT}"
-        TARGET_DESCRIPTION "${arg_TARGET_DESCRIPTION}"
-        TARGET_COMPANY "${arg_TARGET_COMPANY}"
-        TARGET_COPYRIGHT "${arg_TARGET_COPYRIGHT}"
+        TARGET_VERSION ${arg_TARGET_VERSION}
+        TARGET_PRODUCT ${arg_TARGET_PRODUCT}
+        TARGET_DESCRIPTION ${arg_TARGET_DESCRIPTION}
+        TARGET_COMPANY ${arg_TARGET_COMPANY}
+        TARGET_COPYRIGHT ${arg_TARGET_COPYRIGHT}
+        # If you are putting anything after these, make sure that
+        # qt_set_target_info_properties knows how to process them
     )
     qt_internal_add_target_aliases("${target}")
     _qt_internal_apply_strict_cpp("${target}")
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index a556dca6c1..42a02785b8 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -64,12 +64,12 @@ function(qt_internal_add_executable name)
             QT_DELAYED_TARGET_COPYRIGHT "${arg_TARGET_COPYRIGHT}"
             )
     else()
-        if("${arg_TARGET_DESCRIPTION}" STREQUAL "")
+        if(NOT arg_TARGET_DESCRIPTION)
             set(arg_TARGET_DESCRIPTION "Qt ${name}")
         endif()
         qt_set_target_info_properties(${name} ${ARGN}
-            TARGET_DESCRIPTION "${arg_TARGET_DESCRIPTION}"
-            TARGET_VERSION "${arg_VERSION}")
+            TARGET_DESCRIPTION ${arg_TARGET_DESCRIPTION}
+            TARGET_VERSION ${arg_VERSION})
     endif()
 
     if (WIN32 AND NOT arg_DELAY_RC)
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
index c67b862779..7aae145e87 100644
--- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake
@@ -313,19 +313,19 @@ endfunction()
 # On Windows, these properties are used to generate the version information resource.
 function(qt_set_target_info_properties target)
     cmake_parse_arguments(arg "" "${__default_target_info_args}" "" ${ARGN})
-    if("${arg_TARGET_VERSION}" STREQUAL "")
+    if(NOT arg_TARGET_VERSION)
         set(arg_TARGET_VERSION "${PROJECT_VERSION}.0")
     endif()
-    if("${arg_TARGET_PRODUCT}" STREQUAL "")
+    if(NOT arg_TARGET_PRODUCT)
         set(arg_TARGET_PRODUCT "Qt6")
     endif()
-    if("${arg_TARGET_DESCRIPTION}" STREQUAL "")
+    if(NOT arg_TARGET_DESCRIPTION)
         set(arg_TARGET_DESCRIPTION "C++ Application Development Framework")
     endif()
-    if("${arg_TARGET_COMPANY}" STREQUAL "")
+    if(NOT arg_TARGET_COMPANY)
         set(arg_TARGET_COMPANY "The Qt Company Ltd.")
     endif()
-    if("${arg_TARGET_COPYRIGHT}" STREQUAL "")
+    if(NOT arg_TARGET_COPYRIGHT)
         set(arg_TARGET_COPYRIGHT "${QT_COPYRIGHT}")
     endif()
     set_target_properties(${target} PROPERTIES
diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake
index e097fc3ff0..6902a1e219 100644
--- a/cmake/QtToolHelpers.cmake
+++ b/cmake/QtToolHelpers.cmake
@@ -121,11 +121,13 @@ function(qt_internal_add_tool target_name)
         LINK_OPTIONS ${arg_LINK_OPTIONS}
         MOC_OPTIONS ${arg_MOC_OPTIONS}
         DISABLE_AUTOGEN_TOOLS ${disable_autogen_tools}
-        TARGET_VERSION "${arg_TARGET_VERSION}"
-        TARGET_PRODUCT "${arg_TARGET_PRODUCT}"
-        TARGET_DESCRIPTION "${arg_TARGET_DESCRIPTION}"
-        TARGET_COMPANY "${arg_TARGET_COMPANY}"
-        TARGET_COPYRIGHT "${arg_TARGET_COPYRIGHT}"
+        TARGET_VERSION ${arg_TARGET_VERSION}
+        TARGET_PRODUCT ${arg_TARGET_PRODUCT}
+        TARGET_DESCRIPTION ${arg_TARGET_DESCRIPTION}
+        TARGET_COMPANY ${arg_TARGET_COMPANY}
+        TARGET_COPYRIGHT ${arg_TARGET_COPYRIGHT}
+        # If you are putting anything after these, make sure that
+        # qt_set_target_info_properties knows how to process them
     )
     qt_internal_add_target_aliases("${target_name}")
     _qt_internal_apply_strict_cpp("${target_name}")
-- 
cgit v1.2.3