diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in index d0a2f3bdf44..1b96f6a8620 100755 --- a/bin/qt-configure-module.in +++ b/bin/qt-configure-module.in @@ -34,4 +34,5 @@ echo "$arg" >> "$optfile" done cmake_script_path="$script_dir_path/@__relative_path_to_cmake_scripts_dir@/QtProcessConfigureArgs.cmake" -"$script_dir_path/qt-cmake-private" -DOPTFILE=$optfile -DMODULE_ROOT="$module_root" -DCMAKE_COMMAND="$script_dir_path/qt-cmake-private" -P "$cmake_script_path" +qt_cmake_private_path="$script_dir_path/../libexec" +"$qt_cmake_private_path/qt-cmake-private" -DOPTFILE=$optfile -DMODULE_ROOT="$module_root" -DCMAKE_COMMAND="$qt_cmake_private_path/qt-cmake-private" -P "$cmake_script_path" diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake index 2be8a0ab6f2..705a9262929 100644 --- a/cmake/QtWrapperScriptHelpers.cmake +++ b/cmake/QtWrapperScriptHelpers.cmake @@ -76,10 +76,10 @@ function(qt_internal_create_wrapper_scripts) __relative_path_to_cmake_scripts_dir) if(generate_unix) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.in" - "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-configure-module" @ONLY + "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module" @ONLY NEWLINE_STYLE LF) - qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-configure-module" - DESTINATION "${INSTALL_LIBEXECDIR}") + 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" diff --git a/coin/instructions/prepare_configure_module_executable.yaml b/coin/instructions/prepare_configure_module_executable.yaml index 47a0e76aa27..a28359e3fdf 100644 --- a/coin/instructions/prepare_configure_module_executable.yaml +++ b/coin/instructions/prepare_configure_module_executable.yaml @@ -12,7 +12,7 @@ instructions: instructions: - type: EnvironmentVariable variableName: CONFIGURE_EXECUTABLE - variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}libexec{{.Env.CI_PATH_SEP}}qt-configure-module" + variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-configure-module" disable_if: condition: property property: host.os