Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qt5-base] no _debug lib suffixes on macOS (#14225) #21695

Merged
merged 9 commits into from
Dec 16, 2021
Merged

[qt5-base] no _debug lib suffixes on macOS (#14225) #21695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87a1c35
[qt5-base] no _debug lib suffixes on macOS (#14225)
autoantwort Nov 27, 2021
586bdff
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 30, 2021
cb7d456
[qt5-base] patch qt5-base to remove _debug postfix on osx
autoantwort Nov 30, 2021
55a3b9c
Apply suggestions from code review
autoantwort Dec 3, 2021
c42f145
[qt5-base] create link to _debug.pc file from .pc file without _debug
autoantwort Dec 5, 2021
66c197a
Merge branch 'master' into qt5-base-no-absolute2
autoantwort Dec 7, 2021
d44174d
update version
autoantwort Dec 7, 2021
40525d1
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 10, 2021
33211b6
[qt5-base] create forward pkgconfig file
autoantwort Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ports/qt5-base/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,19 @@ if(QT_BUILD_LATEST)
)
endif()

vcpkg_fixup_pkgconfig()
if(NOT VCPKG_TARGET_IS_WINDOWS)
autoantwort marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_fixup_pkgconfig()
endif()
if(VCPKG_TARGET_IS_OSX)
file(GLOB_RECURSE _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/*_debug.*")
foreach(_file ${_debug_libs})
string(REPLACE "_debug" "" _new_filename "${_file}")
file(RENAME "${_file}" "${_new_filename}")
if(_new_filename MATCHES "*.(la|prl|pc)")
vcpkg_replace_string("${_new_filename}" "_debug" "")
autoantwort marked this conversation as resolved.
Show resolved Hide resolved
endif()
endforeach()
endif()

# #Code to get generated CMake files from CI
# file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log")
Expand Down
2 changes: 1 addition & 1 deletion ports/qt5-base/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version-semver": "5.15.2",
"port-version": 16,
"port-version": 17,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5518,7 +5518,7 @@
},
"qt5-base": {
"baseline": "5.15.2",
"port-version": 16
"port-version": 17
},
"qt5-canvas3d": {
"baseline": "0",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7c3312e6857115542e74a0bdbafc9028ff8c251c",
"version-semver": "5.15.2",
"port-version": 17
},
{
"git-tree": "5f510633de982d6e75e3d1170af23feedf208166",
"version-semver": "5.15.2",
Expand Down