<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/10d50e970c60b9c96d9029534b7efb8101600825">https://github.com/macports/macports-ports/commit/10d50e970c60b9c96d9029534b7efb8101600825</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 10d50e970c6 qt6-qtbase: Fix finding qt6 with cmake find_package
</span>10d50e970c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10d50e970c60b9c96d9029534b7efb8101600825
</span>Author: TellowKrinkle <3315070+TellowKrinkle@users.noreply.github.com>
AuthorDate: Fri Dec 1 14:30:25 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtbase: Fix finding qt6 with cmake find_package
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Many cmake projects find qt using find_package(qt6 COMPONENTS core ...)
</span><span style='display:block; white-space:pre;color:#404040;'> Add cmake files in /opt/local/lib/cmake that forward to the ones in the
</span><span style='display:block; white-space:pre;color:#404040;'> libexec prefix so users don't have to override cmake search paths.
</span>---
aqua/qt6/Portfile | 13 +++++++++++++
1 file changed, 13 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be1f330d796..f5d52e176fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1174,6 +1174,19 @@ subport ${name}-qtbase {
</span> ${destroot}${qt6.dir}/bin/qt-cmake
reinplace "s|${prefix}/bin/cmake|/Applications/CMake.app/Contents/bin/cmake|g" \
${destroot}${qt6.dir}/bin/qt-cmake-private
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { "${qt6.dir}" ne "${prefix}" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add dummy cmake find modules that forward to the real ones
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir "${destroot}${prefix}/lib/cmake/Qt6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach configfile [list "Qt6Config.cmake" "Qt6ConfigVersion.cmake"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fd [open "${destroot}${prefix}/lib/cmake/Qt6/${configfile}" "w"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "set(_PREFIX_PATH_BAK \${CMAKE_PREFIX_PATH})"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "list(APPEND CMAKE_PREFIX_PATH \"${qt6.dir}\")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "include(\"${qt6.dir}/lib/cmake/Qt6/${configfile}\")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "set(CMAKE_PREFIX_PATH \${_PREFIX_PATH_BAK})"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Qt builds part of the system using environment provided by MacPorts.
</pre><pre style='margin:0'>
</pre>