mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
tenzapandChristopher Nielsen
f04779ab14
And also upgrade KeePassXC-devel to latest upstream devel commit
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
--- CMakeLists.txt
|
|
+++ CMakeLists.txt
|
|
@@ -471,11 +463,6 @@
|
|
|
|
if(APPLE)
|
|
set(CMAKE_MACOSX_RPATH TRUE)
|
|
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
|
- if(NOT MACDEPLOYQT_EXE)
|
|
- message(FATAL_ERROR "macdeployqt is required to build on macOS")
|
|
- endif()
|
|
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
|
|
set(MACDEPLOYQT_EXTRA_BINARIES "")
|
|
elseif(WIN32)
|
|
find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
|
--- src/post_install/CMakeLists.txt
|
|
+++ src/post_install/CMakeLists.txt
|
|
@@ -5,9 +5,5 @@
|
|
# Run macdeloyqt on the main app and any extra binaries and plugins as specified by the
|
|
# _MACDEPLOYQT_EXTRA_BINARIES global property.
|
|
# All install(TARGETS) calls should have already been called.
|
|
- get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES)
|
|
- kpxc_run_macdeployqt_at_install_time(
|
|
- APP_NAME "${PROGNAME}"
|
|
- EXTRA_BINARIES ${MACDEPLOYQT_EXTRA_BINARIES}
|
|
- )
|
|
+ get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES)
|
|
endif()
|