From b7f1915bd237ba82a74531286119fa53866831b6 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 7 Oct 2020 16:29:38 +0200
Subject: CMake: Fix leftover usage of qt_add_executable

All usages should be replaced with qt_internal_add_executable instead.
This should fix configuration failure of benchmarks and manual tests.

Amends e0c62a48b8a826a46a143e57e94b2a0ea73c7cae

Task-number: QTBUG-86815
Change-Id: I0791d849998ed9517e32f699d843367949b97cb9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtTestHelpers.cmake | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'cmake/QtTestHelpers.cmake')

diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
index 947436b97d..6964ad582c 100644
--- a/cmake/QtTestHelpers.cmake
+++ b/cmake/QtTestHelpers.cmake
@@ -1,12 +1,12 @@
-# Simple wrapper around qt_add_executable for benchmarks which insure that
+# Simple wrapper around qt_internal_add_executable for benchmarks which insure that
 # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
-# See qt_add_executable() for more details.
+# See qt_internal_add_executable() for more details.
 function(qt_internal_add_benchmark target)
 
     qt_parse_all_arguments(arg "qt_add_benchmark"
-        "${__qt_add_executable_optional_args}"
-        "${__qt_add_executable_single_args}"
-        "${__qt_add_executable_multi_args}"
+        "${__qt_internal_add_executable_optional_args}"
+        "${__qt_internal_add_executable_single_args}"
+        "${__qt_internal_add_executable_multi_args}"
         ${ARGN}
     )
 
@@ -16,9 +16,9 @@ function(qt_internal_add_benchmark target)
             OUTPUT_DIRECTORY
             INSTALL_DIRECTORY
         ALL_ARGS
-            "${__qt_add_executable_optional_args}"
-            "${__qt_add_executable_single_args}"
-            "${__qt_add_executable_multi_args}"
+            "${__qt_internal_add_executable_optional_args}"
+            "${__qt_internal_add_executable_single_args}"
+            "${__qt_internal_add_executable_multi_args}"
         ARGS
             ${ARGV}
     )
@@ -27,7 +27,7 @@ function(qt_internal_add_benchmark target)
         set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
 
-    qt_add_executable(${target}
+    qt_internal_add_executable(${target}
         NO_INSTALL # we don't install benchmarks
         OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory
         ${exec_args}
@@ -35,15 +35,15 @@ function(qt_internal_add_benchmark target)
 
 endfunction()
 
-# Simple wrapper around qt_add_executable for manual tests which insure that
+# Simple wrapper around qt_internal_add_executable for manual tests which insure that
 # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
-# See qt_add_executable() for more details.
+# See qt_internal_add_executable() for more details.
 function(qt_internal_add_manual_test target)
 
     qt_parse_all_arguments(arg "qt_add_manual_test"
-        "${__qt_add_executable_optional_args}"
-        "${__qt_add_executable_single_args}"
-        "${__qt_add_executable_multi_args}"
+        "${__qt_internal_add_executable_optional_args}"
+        "${__qt_internal_add_executable_single_args}"
+        "${__qt_internal_add_executable_multi_args}"
         ${ARGN}
     )
 
@@ -53,9 +53,9 @@ function(qt_internal_add_manual_test target)
             OUTPUT_DIRECTORY
             INSTALL_DIRECTORY
         ALL_ARGS
-            "${__qt_add_executable_optional_args}"
-            "${__qt_add_executable_single_args}"
-            "${__qt_add_executable_multi_args}"
+            "${__qt_internal_add_executable_optional_args}"
+            "${__qt_internal_add_executable_single_args}"
+            "${__qt_internal_add_executable_multi_args}"
         ARGS
             ${ARGV}
     )
@@ -64,7 +64,7 @@ function(qt_internal_add_manual_test target)
         set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
 
-    qt_add_executable(${target}
+    qt_internal_add_executable(${target}
         NO_INSTALL # we don't install benchmarks
         OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory
         ${exec_args}
@@ -384,9 +384,9 @@ function(qt_internal_add_test_helper name)
     )
 
     qt_parse_all_arguments(arg "qt_add_test_helper"
-        "${qt_add_test_helper_optional_args};${__qt_add_executable_optional_args}"
-        "${__qt_add_executable_single_args}"
-        "${__qt_add_executable_multi_args}"
+        "${qt_add_test_helper_optional_args};${__qt_internal_add_executable_optional_args}"
+        "${__qt_internal_add_executable_single_args}"
+        "${__qt_internal_add_executable_multi_args}"
          ${ARGN})
 
     qt_remove_args(forward_args
@@ -395,9 +395,9 @@ function(qt_internal_add_test_helper name)
             ${qt_add_test_helper_optional_args}
         ALL_ARGS
             ${qt_add_test_helper_optional_args}
-            ${__qt_add_executable_optional_args}
-            ${__qt_add_executable_single_args}
-            ${__qt_add_executable_multi_args}
+            ${__qt_internal_add_executable_optional_args}
+            ${__qt_internal_add_executable_single_args}
+            ${__qt_internal_add_executable_multi_args}
         ARGS
             ${ARGV}
     )
-- 
cgit v1.2.3