From f941ed5bdcbfeb4601e85e81f7e4069ecd4d24bc Mon Sep 17 00:00:00 2001 From: Chadwick Boulay Date: Fri, 11 Jun 2021 09:00:05 -0400 Subject: [PATCH] LSLCMake - add in-bundle Frameworks path to RPATH to fix problem in CI-provided bundles. --- cmake/LSLCMake.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/LSLCMake.cmake b/cmake/LSLCMake.cmake index cd78abc13..17f78076b 100644 --- a/cmake/LSLCMake.cmake +++ b/cmake/LSLCMake.cmake @@ -108,7 +108,7 @@ function(installLSLApp target) endif() if(APPLE AND NOT CMAKE_INSTALL_RPATH) set_property(TARGET ${target} APPEND - PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIR}") + PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIR};@executable_path/../Frameworks") elseif(UNIX AND NOT CMAKE_INSTALL_RPATH) set_property(TARGET ${target} PROPERTY INSTALL_RPATH "\$ORIGIN:\$ORIGIN/${LIBDIR}") @@ -182,7 +182,8 @@ function(installLSLApp target) endif(APPLE AND target_is_bundle) endif(NOT TARGET liblsl AND NOT LSL_UNIXFOLDERS) # Mac bundles need further fixup (mostly for 3rd party libs) - # fixup_bundle appears to be broken for Qt apps. Use only for non-Qt. + # Only use fixup_bundle for non-Qt, as it is too complicated to provide all Qt libs + # to the third argument of fixup_bundle, especially when macdeployqt can do it for us. if(APPLE AND target_is_bundle AND NOT qtapp) install(CODE "