From c0186d2825c5a1c3461c3bea5900dfc3d9a594f2 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 21 Mar 2022 11:13:20 +0100
Subject: [PATCH] CMake: Rename QT_INTERNAL_CUSTOM_INSTALL_DIR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

to QT_INTERNAL_EXAMPLES_INSTALL_PREFIX so it's clear that the
variable only affects the location of where examples
are installed.

And make sure the paths are passed as CMake paths.

Amends 1031fa15472bba3f20691cda2305e0821391c5db

Task-number: QTBUG-90820
Task-number: QTBUG-96232
Change-Id: Ib92c55488b736d980da2bd88255de78e183de824
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 33f631920f738a323579a426f2b6209b35f941ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 7 ++++---
 cmake/QtPostProcessHelpers.cmake                    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 00ce898efcd..e8914b5d34a 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1106,12 +1106,13 @@ function(qt_internal_add_example_external_project subdir)
     #    example_source_dir, use _qt_internal_override_example_install_dir_to_dot to ensure
     #    INSTALL_EXAMPLEDIR does not interfere.
 
-    # Allow installing somewhere under the build dir.
-    if(QT_INTERNAL_CUSTOM_INSTALL_DIR)
-        set(qt_example_install_prefix "${QT_INTERNAL_CUSTOM_INSTALL_DIR}")
+    # Allow customizing the installation path of the examples. Will be used in CI.
+    if(QT_INTERNAL_EXAMPLES_INSTALL_PREFIX)
+        set(qt_example_install_prefix "${QT_INTERNAL_EXAMPLES_INSTALL_PREFIX}")
     else()
         set(qt_example_install_prefix "${CMAKE_INSTALL_PREFIX}/${INSTALL_EXAMPLESDIR}")
     endif()
+    file(TO_CMAKE_PATH "${qt_example_install_prefix}" qt_example_install_prefix)
 
     set(example_install_prefix "${qt_example_install_prefix}/${example_rel_path}")
 
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
index 83155cd97d9..16e7b252870 100644
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -597,10 +597,11 @@ endif()\n")
                 "set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING \"TRUE\" CACHE BOOL \"\" FORCE)\n")
         endif()
 
-        if(QT_INTERNAL_CUSTOM_INSTALL_DIR)
-            file(TO_CMAKE_PATH "${QT_INTERNAL_CUSTOM_INSTALL_DIR}" qt_internal_custom_install_dir)
+        if(QT_INTERNAL_EXAMPLES_INSTALL_PREFIX)
+            file(TO_CMAKE_PATH
+                "${QT_INTERNAL_EXAMPLES_INSTALL_PREFIX}" examples_install_prefix)
             string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
-                "set(QT_INTERNAL_CUSTOM_INSTALL_DIR \"${qt_internal_custom_install_dir}\" CACHE STRING \"\")\n")
+                "set(QT_INTERNAL_EXAMPLES_INSTALL_PREFIX \"${examples_install_prefix}\" CACHE STRING \"\")\n")
         endif()
 
         # Save the default qpa platform.