diff options
| author | Cristian Le <[email protected]> | 2025-04-11 18:16:15 +0200 |
|---|---|---|
| committer | Cristian Le <[email protected]> | 2025-06-26 17:32:00 +0200 |
| commit | 67051c779dea7135ee03fb630207f26fe889c450 (patch) | |
| tree | b8a800335ab104527a6d77c6141126e05c4c55ce /cmake | |
| parent | ef34f26168e68d8214d3e4250f4f4c67132679d1 (diff) | |
Add QT_INSTALL_CI_FILES
Gate the installation of CI-only files by this option.
Change-Id: I9327bac01707ceaa27aa0c91952ddb4846589dca
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 16 | ||||
| -rw-r--r-- | cmake/QtBuildHelpers.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtBuildInternalsExtra.cmake.in | 4 | ||||
| -rw-r--r-- | cmake/QtBuildOptionsHelpers.cmake | 13 |
4 files changed, 27 insertions, 7 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 029546fd65d..cef0166097b 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -443,10 +443,12 @@ elseif(WASM) endif() # Install CI support files to libexec. -qt_path_join(__qt_libexec_install_dir "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}") -qt_copy_or_install(FILES coin/instructions/qmake/ensure_pro_file.cmake - DESTINATION "${__qt_libexec_install_dir}") -qt_copy_or_install(PROGRAMS "util/testrunner/qt-testrunner.py" - DESTINATION "${__qt_libexec_install_dir}") -qt_copy_or_install(PROGRAMS "util/testrunner/sanitizer-testrunner.py" - DESTINATION "${__qt_libexec_install_dir}") +if(QT_INSTALL_CI_FILES) + qt_path_join(__qt_libexec_install_dir "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}") + qt_copy_or_install(FILES coin/instructions/qmake/ensure_pro_file.cmake + DESTINATION "${__qt_libexec_install_dir}") + qt_copy_or_install(PROGRAMS "util/testrunner/qt-testrunner.py" + DESTINATION "${__qt_libexec_install_dir}") + qt_copy_or_install(PROGRAMS "util/testrunner/sanitizer-testrunner.py" + DESTINATION "${__qt_libexec_install_dir}") +endif() diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake index 60d66eb2353..1fb5c6350e1 100644 --- a/cmake/QtBuildHelpers.cmake +++ b/cmake/QtBuildHelpers.cmake @@ -429,6 +429,7 @@ macro(qt_internal_setup_build_and_global_variables) qt_internal_set_qt_source_tree_var() qt_internal_set_export_compile_commands() qt_internal_set_configure_from_ide() + qt_internal_set_ci_options() # Depends on qt_internal_set_configure_from_ide qt_internal_set_sync_headers_at_configure_time() diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in index 8985f8178a9..32b9facfece 100644 --- a/cmake/QtBuildInternalsExtra.cmake.in +++ b/cmake/QtBuildInternalsExtra.cmake.in @@ -73,6 +73,10 @@ if(@FEATURE_developer_build@) set(FEATURE_developer_build ON CACHE BOOL "Developer build." FORCE) endif() +# Propagate CI files installation +set(QT_INSTALL_CI_FILES @QT_INSTALL_CI_FILES@ CACHE BOOL + "Install CI files for internal use only" FORCE) + # Propagate non-prefix builds. set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) diff --git a/cmake/QtBuildOptionsHelpers.cmake b/cmake/QtBuildOptionsHelpers.cmake index a2f352c39c6..ccd054183d4 100644 --- a/cmake/QtBuildOptionsHelpers.cmake +++ b/cmake/QtBuildOptionsHelpers.cmake @@ -155,6 +155,19 @@ macro(qt_internal_set_configure_from_ide) endif() endmacro() +function(qt_internal_set_ci_options) + # Do not install CI only files except for + # - developer-builds + # - in coin CI + if(QT_FEATURE_developer_build OR DEFINED ENV{COIN_UNIQUE_JOB_ID}) + set(__QT_INSTALL_CI_FILES_default ON) + else() + set(__QT_INSTALL_CI_FILES_default OFF) + endif() + set(QT_INSTALL_CI_FILES ${__QT_INSTALL_CI_FILES_default} CACHE BOOL + "Install CI files for internal use only") +endfunction() + macro(qt_internal_set_sync_headers_at_configure_time) set(_qt_sync_headers_at_configure_time_default ${QT_INTERNAL_CONFIGURE_FROM_IDE}) |