8ffb6ce64c
The config.redo script can be executed to reconfigure a pre-existing
qt build dir with the configure options that were last passed to the
build.
It just calls the original configure script with the -redo option.
It's nicer than calling configure + -redo manually because you don't
need to write out the full source path for configure.
In qt 5 times this script was called config.status.
On windows the script is called config.redo.bat.
Rename the config.redo file that QtWriteArgsFile.cmake writes to
to config.redo.last, so it doesn't conflict with the name of new
config.redo script.
Amends 5c40cb0f1a
Pick-to: 6.5 6.6
Change-Id: Id47c56a24561410aec6fbaa79b13fc8a78d12ed0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
297 lines
13 KiB
CMake
297 lines
13 KiB
CMake
# Copyright (C) 2022 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
# Creates and installs the following wrapper CMake scripts:
|
|
# qt-make
|
|
# qt-cmake-private
|
|
# qt-configure-module
|
|
# qt-cmake-private-install
|
|
# And other helper scripts.
|
|
function(qt_internal_create_wrapper_scripts)
|
|
# Provide a convenience cmake wrapper.
|
|
|
|
if(QT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS)
|
|
set(generate_unix TRUE)
|
|
set(generate_non_unix TRUE)
|
|
elseif(CMAKE_HOST_UNIX)
|
|
set(generate_unix TRUE)
|
|
else()
|
|
set(generate_non_unix TRUE)
|
|
endif()
|
|
|
|
if(generate_unix)
|
|
if(IOS)
|
|
set(infix ".ios")
|
|
else()
|
|
set(infix "")
|
|
endif()
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake${infix}.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" @ONLY
|
|
NEWLINE_STYLE LF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" @ONLY
|
|
NEWLINE_STYLE CRLF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
|
|
if(generate_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-create.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-create" @ONLY
|
|
NEWLINE_STYLE LF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-create"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-create.bat.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-create.bat" @ONLY
|
|
NEWLINE_STYLE CRLF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-create.bat"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
# Provide a private convenience wrapper with options which should not be propagated via the
|
|
# public qt-cmake wrapper e.g. CMAKE_GENERATOR.
|
|
# These options can not be set in a toolchain file, but only on the command line.
|
|
# These options should not be in the public wrapper, because a consumer of Qt might want to
|
|
# build their CMake app with the Unix Makefiles generator, while Qt should be built with the
|
|
# Ninja generator.
|
|
# The private wrapper is more conveient for building Qt itself, because a developer doesn't need
|
|
# to specify the same options for each qt module built.
|
|
set(__qt_cmake_extra "-G\"${CMAKE_GENERATOR}\"")
|
|
if(generate_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-cmake-private" @ONLY
|
|
NEWLINE_STYLE LF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-cmake-private"
|
|
DESTINATION "${INSTALL_LIBEXECDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat" @ONLY
|
|
NEWLINE_STYLE CRLF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
unset(__qt_cmake_extra)
|
|
|
|
# Provide a script to configure Qt modules.
|
|
if(QT_WILL_INSTALL)
|
|
set(__relative_path_to_cmake_scripts_dir
|
|
"${__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir}")
|
|
else()
|
|
file(RELATIVE_PATH __relative_path_to_cmake_scripts_dir
|
|
"${__qt_bin_dir_absolute}" "${CMAKE_CURRENT_LIST_DIR}")
|
|
endif()
|
|
file(TO_NATIVE_PATH "${__relative_path_to_cmake_scripts_dir}"
|
|
__relative_path_to_cmake_scripts_dir)
|
|
if(generate_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module" @ONLY
|
|
NEWLINE_STYLE LF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.bat.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module.bat" @ONLY
|
|
NEWLINE_STYLE CRLF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module.bat"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
unset(__relative_path_to_cmake_scripts_dir)
|
|
|
|
# Provide a private convenience wrapper to configure and build one or more standalone tests.
|
|
# Calling CMake directly on a Qt test project won't work because the project does not call
|
|
# find_package(Qt...) to get all dependencies like examples do.
|
|
# Instead a template CMakeLists.txt project is used which sets up all the necessary private bits
|
|
# and then calls add_subdirectory on the provided project path.
|
|
set(__qt_cmake_standalone_test_name "qt-cmake-standalone-test")
|
|
if(generate_unix)
|
|
set(__qt_cmake_standalone_test_libexec_path
|
|
"${INSTALL_LIBEXECDIR}/${__qt_cmake_standalone_test_name}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
set(__qt_cmake_standalone_test_bin_path
|
|
"${INSTALL_BINDIR}/${__qt_cmake_standalone_test_name}")
|
|
endif()
|
|
|
|
# Configuring a standalone test on iOS should use the Xcode generator, but qt-cmake-private uses
|
|
# the generator that was used to build Qt itself (e.g. Ninja).
|
|
# Use qt-cmake instead, which does use the Xcode generator since Qt 6.2.5, 6.3.1, 6.4.
|
|
if(IOS)
|
|
set(__qt_cmake_private_path
|
|
"${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake")
|
|
else()
|
|
if(generate_unix)
|
|
set(__qt_cmake_private_path
|
|
"${QT_STAGING_PREFIX}/${INSTALL_LIBEXECDIR}/qt-cmake-private")
|
|
endif()
|
|
if(generate_non_unix)
|
|
set(__qt_cmake_private_path
|
|
"${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private")
|
|
endif()
|
|
endif()
|
|
|
|
set(__qt_cmake_standalone_test_path
|
|
"${__build_internals_install_dir}/${__build_internals_standalone_test_template_dir}")
|
|
|
|
if(QT_WILL_INSTALL)
|
|
# Need to prepend the staging prefix when doing prefix builds, because the build internals
|
|
# install dir is relative in that case..
|
|
qt_path_join(__qt_cmake_standalone_test_path
|
|
"${QT_STAGING_PREFIX}"
|
|
"${__qt_cmake_standalone_test_path}")
|
|
endif()
|
|
|
|
if(generate_unix)
|
|
get_filename_component(rel_base_path
|
|
"${QT_STAGING_PREFIX}/${__qt_cmake_standalone_test_libexec_path}"
|
|
DIRECTORY)
|
|
|
|
file(RELATIVE_PATH __qt_cmake_private_relpath "${rel_base_path}"
|
|
"${__qt_cmake_private_path}")
|
|
file(RELATIVE_PATH __qt_cmake_standalone_test_relpath "${rel_base_path}"
|
|
"${__qt_cmake_standalone_test_path}")
|
|
|
|
set(__qt_cmake_standalone_test_os_prelude "#!/bin/sh")
|
|
set(__qt_cmake_standalone_test_script_relpath "SCRIPT_DIR=`dirname $0`")
|
|
string(PREPEND __qt_cmake_private_relpath "exec $SCRIPT_DIR/")
|
|
string(PREPEND __qt_cmake_standalone_test_relpath "$SCRIPT_DIR/")
|
|
set(__qt_cmake_standalone_passed_args "\"$@\" -DPWD=\"$PWD\"")
|
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-standalone-test.in"
|
|
"${QT_BUILD_DIR}/${__qt_cmake_standalone_test_libexec_path}"
|
|
NEWLINE_STYLE LF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_libexec_path}"
|
|
DESTINATION "${INSTALL_LIBEXECDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
get_filename_component(rel_base_path
|
|
"${QT_STAGING_PREFIX}/${__qt_cmake_standalone_test_bin_path}"
|
|
DIRECTORY)
|
|
|
|
file(RELATIVE_PATH __qt_cmake_private_relpath "${rel_base_path}"
|
|
"${__qt_cmake_private_path}")
|
|
file(RELATIVE_PATH __qt_cmake_standalone_test_relpath "${rel_base_path}"
|
|
"${__qt_cmake_standalone_test_path}")
|
|
|
|
set(__qt_cmake_standalone_test_os_prelude "@echo off")
|
|
set(__qt_cmake_standalone_test_script_relpath "set SCRIPT_DIR=%~dp0")
|
|
string(APPEND __qt_cmake_standalone_test_bin_path ".bat")
|
|
string(APPEND __qt_cmake_private_relpath ".bat")
|
|
string(PREPEND __qt_cmake_private_relpath "%SCRIPT_DIR%")
|
|
string(PREPEND __qt_cmake_standalone_test_relpath "%SCRIPT_DIR%")
|
|
set(__qt_cmake_standalone_passed_args "%* -DPWD=\"%CD%\"")
|
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-standalone-test.in"
|
|
"${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
|
|
NEWLINE_STYLE CRLF)
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
|
|
# Create an installation script that the CI can use to handle installation for both
|
|
# single and multiple configurations.
|
|
set(__qt_cmake_install_script_name "qt-cmake-private-install.cmake")
|
|
if(CMAKE_CONFIGURATION_TYPES)
|
|
set(__qt_configured_configs "${CMAKE_CONFIGURATION_TYPES}")
|
|
elseif(CMAKE_BUILD_TYPE)
|
|
set(__qt_configured_configs "${CMAKE_BUILD_TYPE}")
|
|
endif()
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/${__qt_cmake_install_script_name}.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${__qt_cmake_install_script_name}" @ONLY)
|
|
qt_install(FILES "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${__qt_cmake_install_script_name}"
|
|
DESTINATION "${INSTALL_LIBEXECDIR}")
|
|
|
|
qt_internal_create_qt_configure_tests_wrapper_script()
|
|
qt_internal_create_qt_configure_redo_script()
|
|
endfunction()
|
|
|
|
function(qt_internal_create_qt_configure_tests_wrapper_script)
|
|
if(QT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS)
|
|
set(generate_unix TRUE)
|
|
set(generate_non_unix TRUE)
|
|
elseif(CMAKE_HOST_UNIX)
|
|
set(generate_unix TRUE)
|
|
else()
|
|
set(generate_non_unix TRUE)
|
|
endif()
|
|
|
|
# Create a private wrapper script to configure and build all standalone tests.
|
|
#
|
|
# The script uses qt-cmake instead of qt-cmake-private on purpose. That's to ensure we build
|
|
# only one configuration of tests (e.g RelWithDebInfo only) when Qt is configured with more
|
|
# than one configuration (RelWithDebInfo;Debug).
|
|
# Meant to be used by our CI instructions.
|
|
#
|
|
# The script takes a path to the repo for which the standalone tests will be configured.
|
|
set(script_name "qt-internal-configure-tests")
|
|
|
|
set(script_passed_args "-DQT_BUILD_STANDALONE_TESTS=ON")
|
|
|
|
file(RELATIVE_PATH relative_path_from_libexec_dir_to_bin_dir
|
|
${__qt_libexec_dir_absolute}
|
|
${__qt_bin_dir_absolute})
|
|
file(TO_NATIVE_PATH "${relative_path_from_libexec_dir_to_bin_dir}"
|
|
relative_path_from_libexec_dir_to_bin_dir)
|
|
|
|
if(generate_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/${script_name}.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}" @ONLY
|
|
NEWLINE_STYLE LF)
|
|
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}"
|
|
DESTINATION "${INSTALL_LIBEXECDIR}")
|
|
endif()
|
|
if(generate_non_unix)
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/${script_name}.bat.in"
|
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}.bat" @ONLY
|
|
NEWLINE_STYLE CRLF)
|
|
|
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}.bat"
|
|
DESTINATION "${INSTALL_BINDIR}")
|
|
endif()
|
|
endfunction()
|
|
|
|
# Create a shell wrapper script to reconfigure Qt with the original configure arguments and
|
|
# any additional ones passed.
|
|
#
|
|
# Removes CMakeCache.txt and friends, either manually, or using CMake's --fresh.
|
|
#
|
|
# The script is created in the root of the build dir and is called config.redo
|
|
# It has the same contents as the 'config.status' script we created in qt 5.
|
|
function(qt_internal_create_qt_configure_redo_script)
|
|
set(input_script_name "qt-internal-config.redo")
|
|
set(input_script_path "${CMAKE_CURRENT_SOURCE_DIR}/libexec/${input_script_name}")
|
|
|
|
# We don't use QT_BUILD_DIR because we want the file in the root of the build dir in a top-level
|
|
# build.
|
|
set(output_script_name "config.redo")
|
|
set(output_path "${CMAKE_BINARY_DIR}/${output_script_name}")
|
|
|
|
if(QT_SUPERBUILD)
|
|
set(configure_script_path "${Qt_SOURCE_DIR}")
|
|
else()
|
|
set(configure_script_path "${QtBase_SOURCE_DIR}")
|
|
endif()
|
|
string(APPEND configure_script_path "/configure")
|
|
|
|
# Used in the file contents.
|
|
file(TO_NATIVE_PATH "${configure_script_path}" configure_path)
|
|
|
|
if(CMAKE_HOST_UNIX)
|
|
string(APPEND input_script_path ".in")
|
|
set(newline_style "LF")
|
|
else()
|
|
string(APPEND input_script_path ".bat.in")
|
|
string(APPEND output_path ".bat")
|
|
set(newline_style "CRLF")
|
|
endif()
|
|
|
|
configure_file("${input_script_path}" "${output_path}" @ONLY NEWLINE_STYLE ${newline_style})
|
|
endfunction()
|