From 5136c6a78ac14eb1e2804983c8963d45ee6246e8 Mon Sep 17 00:00:00 2001 From: Jonatan Liljedahl Date: Thu, 26 Jan 2012 22:24:02 +0100 Subject: [PATCH] OSX: install libs into bundle explicitly even if install_qt4_executable usually copies these automagically, it did not work in a generated XCode build for some reason. this fixes it. --- external_libraries/CMakeLists.txt | 5 ++++- server/scsynth/CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt index adfcc893d..8d83be321 100644 --- a/external_libraries/CMakeLists.txt +++ b/external_libraries/CMakeLists.txt @@ -66,7 +66,10 @@ endif() if(APPLE) - # on osx, install_qt4_executable copies the needed libs from the build dir into the installed .app + include (${CMAKE_SOURCE_DIR}/cmake_modules/MacAppFolder.cmake) + install(TARGETS supercollider_boost_thread + LIBRARY DESTINATION "${scappauxresourcesdir}/../MacOS" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) elseif(WIN32) install(TARGETS supercollider_boost_thread DESTINATION "SuperCollider" diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt index 06ea599d2..5cf47f203 100644 --- a/server/scsynth/CMakeLists.txt +++ b/server/scsynth/CMakeLists.txt @@ -216,9 +216,9 @@ endif() if(APPLE) # determines the app name and app install location (scappbundlename, scappdir): include (${CMAKE_SOURCE_DIR}/cmake_modules/MacAppFolder.cmake) - # on osx, install_qt4_executable copies the needed libs from the build dir into the installed .app - install(TARGETS scsynth - DESTINATION "${scappauxresourcesdir}" + install(TARGETS scsynth libscsynth + RUNTIME DESTINATION "${scappauxresourcesdir}" + LIBRARY DESTINATION "${scappauxresourcesdir}/../MacOS" PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE OWNER_WRITE COMPONENT app) elseif(WIN32) -- 2.11.4.GIT