mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-04 15:39:34 +01:00
abfebea4f2
CPack by default invokes the 'make install' target to install all project files into a staging area for further packaging. The order of installation follows the order of install() commands. One of the first install() commands is the one that installs the KeePassXC.app bundle and all the contents inside of it, which includes POST_BUILD copied binaries like keepassxc-cli and keepassxc-proxy. Subsequent install(TARGETS) commands would then override the keepassxc-cli and keepassxc-proxy binaries inside the staging area with the ones which didn't have macdeployqt run on them (the ones from src/cli and src/proxy). Launching the binaries would then fail because of missing rpath adjustments. The libkeepassxc-autotype-cocoa.so library was working fine because there is no install(TARGETS) command for it in a WITH_APP_BUNDLE build, so the POST_BUILD copy with the adjusted rpaths was preserved. To fix the issue and make the handling consistent, macdeployqt is no longer run at POST_BUILD time, but instead at 'make install' time, after each binary is installed by install(TARGETS). libkeepassxc-autotype-cocoa.so also has its install command run unconditionally now. The build dir binaries that are POST_BUILD copied into src/KeePassXC.app continue to run because they use the build dir rpaths that CMake embeds by default. They don't macdeployqt run for them anymore, which slightly speeds up the build time. Fixes: #7475
48 lines
2.0 KiB
CMake
Executable File
48 lines
2.0 KiB
CMake
Executable File
# Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
if(WITH_XC_BROWSER)
|
|
set(proxy_SOURCES
|
|
../browser/BrowserShared.cpp
|
|
keepassxc-proxy.cpp
|
|
NativeMessagingProxy.cpp)
|
|
|
|
# Alloc must be defined in a static library to prevent clashing with clang ASAN definitions
|
|
add_library(proxy_alloc STATIC ../core/Alloc.cpp)
|
|
target_link_libraries(proxy_alloc PRIVATE Qt5::Core ${BOTAN2_LIBRARIES})
|
|
|
|
add_executable(keepassxc-proxy ${proxy_SOURCES})
|
|
target_link_libraries(keepassxc-proxy proxy_alloc Qt5::Core Qt5::Network)
|
|
install(TARGETS keepassxc-proxy
|
|
BUNDLE DESTINATION . COMPONENT Runtime
|
|
RUNTIME DESTINATION ${PROXY_INSTALL_DIR} COMPONENT Runtime)
|
|
|
|
if(APPLE AND WITH_APP_BUNDLE)
|
|
set(PROXY_APP_DIR "${CMAKE_BINARY_DIR}/src/${PROXY_INSTALL_DIR}")
|
|
add_custom_command(TARGET keepassxc-proxy
|
|
POST_BUILD
|
|
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/keepassxc-proxy ${PROXY_APP_DIR}/keepassxc-proxy
|
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
|
COMMENT "Copying keepassxc-proxy into app bundle")
|
|
|
|
kpxc_run_macdeployqt_on_installed_helper_binary(
|
|
"${PROGNAME}" "${PROXY_INSTALL_DIR}/keepassxc-proxy")
|
|
endif()
|
|
|
|
if(WIN32)
|
|
target_link_libraries(keepassxc-proxy Wtsapi32.lib Ws2_32.lib)
|
|
endif()
|
|
endif()
|