Merge pull request #147 from pleprince/fix-dylib-rpath-in-mac-os-app-bundles

146: Resolve dylib rpath issues in MacOS app bundles

Author: tedwaine

.gitignore

@@ -12,3 +12,5 @@ python/src/xstudio/version.py
 .vs/
 .DS_Store
 /build/
+xstudio_install/
+**/qml/*_qml_export.h

cmake/macros.cmake

@@ -101,10 +101,12 @@ macro(default_options_local name)
 	    	$<BUILD_INTERFACE:${ROOT_DIR}/extern/include>
 	)
 	if (APPLE)
-		set_target_properties(${name}
-	    	PROPERTIES
-	    	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/xSTUDIO.app/Contents/Frameworks"
-		)
+    set_target_properties(${name}
+        PROPERTIES
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/xSTUDIO.app/Contents/Frameworks"
+        INSTALL_RPATH "@executable_path/../Frameworks"
+        INSTALL_RPATH_USE_LINK_PATH TRUE
+    )
 	else()
 		set_target_properties(${name}
 	    	PROPERTIES
@@ -204,7 +206,7 @@ macro(default_plugin_options name)
 				COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" "${CMAKE_CURRENT_BINARY_DIR}/plugin"
 		)
 	endif()
-	
+
 endmacro()
 
 macro(add_plugin_qml name _dir)
@@ -366,7 +368,7 @@ macro(add_python_plugin NAME)
             copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${NAME} ${CMAKE_BINARY_DIR}/bin/plugin-python/${NAME})
 
 	endif()
-	
+
 endmacro()
 
 macro(create_plugin NAME VERSION DEPS)

src/global/src/CMakeLists.txt

@@ -57,4 +57,12 @@ if(UNIX AND NOT APPLE)
     target_link_libraries(${PROJECT_NAME} PRIVATE asound)  # Link against asound on Linux
 endif()
 
-set_target_properties(${PROJECT_NAME} PROPERTIES LINK_DEPENDS_NO_SHARED true)
+if(APPLE)
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+        LINK_DEPENDS_NO_SHARED true
+        INSTALL_RPATH "@executable_path/../Frameworks"
+        BUILD_WITH_INSTALL_RPATH TRUE
+    )
+else()
+    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_DEPENDS_NO_SHARED true)
+endif()

src/launch/xstudio/src/CMakeLists.txt

@@ -12,12 +12,12 @@ set(SOURCES
 	xstudio.cpp
 	xstudio_win_resource.rc
 	../../../../ui/qml/xstudio/qml.qrc
-	)	
+	)
 else()
 set(SOURCES
 	xstudio.cpp
 	../../../../ui/qml/xstudio/qml.qrc
-	)	
+	)
 endif()
 if(WIN32)
     # Add the /bigobj option for xstudio.cpp
@@ -134,6 +134,12 @@ elseif(APPLE)
         configure_file(macdeploy.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/macdeploy.cmake @ONLY)
     install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/macdeploy.cmake)
 
+    # Add custom command to fix library paths after build
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -DAPP_BUNDLE_DIR=${CMAKE_BINARY_DIR}/xSTUDIO.app
+            -P ${CMAKE_CURRENT_SOURCE_DIR}/fixup_macos_bundle.cmake
+    )
+
 else()
 
 	set_target_properties(${PROJECT_NAME}

src/launch/xstudio/src/fixup_macos_bundle.cmake

@@ -0,0 +1,15 @@
+# Fix library paths in the app bundle to ensure they're relative
+file(GLOB_RECURSE LIBRARIES "${APP_BUNDLE_DIR}/Contents/Frameworks/*.dylib")
+foreach(LIB ${LIBRARIES})
+    get_filename_component(LIB_NAME ${LIB} NAME)
+    execute_process(COMMAND install_name_tool -id "@rpath/${LIB_NAME}" ${LIB})
+endforeach()
+
+# Fix executable references to libraries
+execute_process(
+    COMMAND
+    install_name_tool
+    -add_rpath
+    "@executable_path/../Frameworks"
+    ${APP_BUNDLE_DIR}/Contents/MacOS/xstudio.bin
+)

src/launch/xstudio/src/macdeploy.cmake.in

@@ -1,3 +1,19 @@
 message("Running @macdeployqt_exe@ with args: ${CMAKE_BINARY_DIR}/xSTUDIO.app -qmldir=@CMAKE_SOURCE_DIR@/ui")
 execute_process(COMMAND "@macdeployqt_exe@" ${CMAKE_BINARY_DIR}/xSTUDIO.app -qmldir=@CMAKE_SOURCE_DIR@/ui
-    WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
+    WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
+
+# Fix library paths to ensure they're relative to the bundle
+execute_process(
+    COMMAND
+    install_name_tool -id
+    "@rpath/libglobal.dylib"
+    ${CMAKE_BINARY_DIR}/xSTUDIO.app/Contents/Frameworks/libglobal.dylib
+)
+execute_process(
+    COMMAND
+    install_name_tool
+    -change
+    "@rpath/libglobal.dylib"
+    "@executable_path/../Frameworks/libglobal.dylib"
+    ${CMAKE_BINARY_DIR}/xSTUDIO.app/Contents/MacOS/xstudio.bin
+)