Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing up bundles in Mac now works

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@352 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Mike Kremer
2010-12-07 13:12:02 +00:00
parent 5fe025d941
commit 50a3f6e58c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -50,11 +50,11 @@ if (APPLE)
COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/fixbundle.cmake" COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/fixbundle.cmake"
) )
# let bundle generation depend on all targets # let bundle generation depend on all targets
add_dependencies (fixbundle QtViewer DecimaterGui) add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui)
# install bundle # install bundle
install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/OpenMesh.app DESTINATION . #install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/OpenMesh.app DESTINATION .
USE_SOURCE_PERMISSIONS) # USE_SOURCE_PERMISSIONS)
endif () endif ()
# ======================================================================== # ========================================================================

13
cmake/fixbundle.cmake.in
View File

@@ -52,11 +52,16 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
get_filename_component(_GlewDir "@GLEW_LIBRARY@" PATH) get_filename_component(_GlewDir "@GLEW_LIBRARY@" PATH)
# fix all dependencies # 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/bin/DecimaterGui "${_qtplugins}" "/usr/lib;${_qtdirs}")
fixup_bundle (@CMAKE_BINARY_DIR@/Build/OpenMesh.app "${_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 # 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")