From 33f631920f738a323579a426f2b6209b35f941ff Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 21 Mar 2022 11:13:20 +0100 Subject: 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 Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Task-number: QTBUG-96232 Change-Id: Ib92c55488b736d980da2bd88255de78e183de824 Reviewed-by: Jörg Bornemann --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cmake/QtBuildInternals/QtBuildInternalsConfig.cmake') diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 1a05a563b1..2d63b40544 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1129,12 +1129,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}") -- cgit v1.2.3