File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ function(installLSLApp target)
108108 endif ()
109109 if (APPLE AND NOT CMAKE_INSTALL_RPATH )
110110 set_property (TARGET ${target} APPEND
111- PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIR} " )
111+ PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIR} ;@executable_path/../Frameworks " )
112112 elseif (UNIX AND NOT CMAKE_INSTALL_RPATH )
113113 set_property (TARGET ${target}
114114 PROPERTY INSTALL_RPATH "\$ ORIGIN:\$ ORIGIN/${LIBDIR} " )
@@ -182,7 +182,8 @@ function(installLSLApp target)
182182 endif (APPLE AND target_is_bundle)
183183 endif (NOT TARGET liblsl AND NOT LSL_UNIXFOLDERS)
184184 # Mac bundles need further fixup (mostly for 3rd party libs)
185- # fixup_bundle appears to be broken for Qt apps. Use only for non-Qt.
185+ # Only use fixup_bundle for non-Qt, as it is too complicated to provide all Qt libs
186+ # to the third argument of fixup_bundle, especially when macdeployqt can do it for us.
186187 if (APPLE AND target_is_bundle AND NOT qtapp)
187188 install (CODE
188189 "
You can’t perform that action at this time.
0 commit comments