[vcpkg baseline][qtapplicationmanager] Configure hardcodes bin paths. (#23638)

* disable parallel configure

* run buildtypes manually

* correct close statement

* version stuff
This commit is contained in:
Alexander Neumann 2022-03-21 19:14:26 +01:00 committed by GitHub
parent e383f75a8f
commit 6ba1666604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 18 deletions

View File

@ -22,24 +22,40 @@ endif()
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_cmake_configure(${_opt}
OPTIONS
-DINPUT_libarchive=system
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
OPTIONS_DEBUG
OPTIONS_RELEASE)
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
if(VCPKG_TARGET_IS_WINDOWS)
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
if(EXISTS "${scriptfile}")
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
endif()
set(build_type_backup ${VCPKG_BUILD_TYPE})
set(path_backup "$ENV{PATH}")
if(NOT VCPKG_BUILD_TYPE)
set(types release debug)
else()
set(types ${VCPKG_BUILD_TYPE})
endif()
vcpkg_cmake_install(ADD_BIN_TO_PATH)
foreach(VCPKG_BUILD_TYPE IN LISTS types)
if(VCPKG_BUILD_TYPE STREQUAL debug)
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin")
else()
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin")
endif()
qt_cmake_configure(${_opt}
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DINPUT_libarchive=system
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
OPTIONS_DEBUG
OPTIONS_RELEASE)
if(VCPKG_TARGET_IS_WINDOWS)
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
if(EXISTS "${scriptfile}")
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
endif()
endif()
vcpkg_cmake_install()
set(ENV{PATH} "${path_backup}")
endforeach()
set(VCPKG_BUILD_TYPE ${build_type_backup})
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})

View File

@ -1,6 +1,7 @@
{
"name": "qtapplicationmanager",
"version": "6.2.3",
"port-version": 1,
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -5810,7 +5810,7 @@
},
"qtapplicationmanager": {
"baseline": "6.2.3",
"port-version": 0
"port-version": 1
},
"qtbase": {
"baseline": "6.2.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6",
"version": "6.2.3",
"port-version": 1
},
{
"git-tree": "9597e662be8fbe3317e0fd88058071db708da977",
"version": "6.2.3",