diff --git a/CMakeLists.txt b/CMakeLists.txt index 8abb0266..f8d19f2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,11 +50,11 @@ if (APPLE) COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/fixbundle.cmake" ) # let bundle generation depend on all targets - add_dependencies (fixbundle QtViewer DecimaterGui) + add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui) # install bundle - install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/OpenMesh.app DESTINATION . - USE_SOURCE_PERMISSIONS) + #install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/OpenMesh.app DESTINATION . + # USE_SOURCE_PERMISSIONS) endif () # ======================================================================== diff --git a/cmake/fixbundle.cmake.in b/cmake/fixbundle.cmake.in index 8f73938b..06b57d1a 100644 --- a/cmake/fixbundle.cmake.in +++ b/cmake/fixbundle.cmake.in @@ -52,11 +52,16 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH) get_filename_component(_GlewDir "@GLEW_LIBRARY@" PATH) # fix all dependencies -fixup_bundle ("@CMAKE_BINARY_DIR@/Build/OpenMesh.app" "" "${_GlutDir};${_GlewDir}") +fixup_bundle ("@CMAKE_BINARY_DIR@/Build/bin/DecimaterGui" "" "${_GlutDir};${_GlewDir}") +fixup_bundle ("@CMAKE_BINARY_DIR@/Build/bin/ProgViewer" "" "${_GlutDir};${_GlewDir}") +fixup_bundle ("@CMAKE_BINARY_DIR@/Build/bin/QtViewer" "" "${_GlutDir};${_GlewDir}") +fixup_bundle ("@CMAKE_BINARY_DIR@/Build/bin/SubdividerGui" "" "${_GlutDir};${_GlewDir}") -# fix all dependencies -fixup_bundle (@CMAKE_BINARY_DIR@/Build/OpenMesh.app "${_qtplugins}" "/usr/lib;${_qtdirs}") +fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/DecimaterGui "${_qtplugins}" "/usr/lib;${_qtdirs}") +fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/ProgViewer "${_qtplugins}" "/usr/lib;${_qtdirs}") +fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/QtViewer "${_qtplugins}" "/usr/lib;${_qtdirs}") +fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/SubdividerGui "${_qtplugins}" "/usr/lib;${_qtdirs}") # create qt plugin configuration file -file(WRITE "@CMAKE_BINARY_DIR@/Build/OpenMesh.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins") +# file(WRITE "@CMAKE_BINARY_DIR@/Build/OpenMesh.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")