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

Changed paths for Build to build only in Build dir, Disabled fixbundle until i really get a fix

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@402 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2011-08-31 12:06:29 +00:00
parent 26bccf29ca
commit 54ab82f88a
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/ACGCommon.cmake
View File

@@ -74,6 +74,12 @@ if (WIN32)
if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}) if (NOT EXISTS ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR})
endif () endif ()
elseif (APPLE)
set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}")
set (CMAKE_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}")
set (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins")
set (ACG_PROJECT_BINDIR "bin")
else () else ()
set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}")

32
cmake/fixbundle.cmake.in
View File

@@ -39,24 +39,24 @@ endfunction(gp_item_default_embedded_path_override)
include (BundleUtilities) include (BundleUtilities)
if ( @BUILD_APPS@ ) #if ( @BUILD_APPS@ )
message("Fixing up bundle ...") # message("Fixing up bundle ...")
#
# # copy qt plugins to bundle
# file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so")
# file (GLOB_RECURSE _qtplugins "@QT_PLUGINS_DIR@/*.bundle")
# foreach (_qtp ${_qtplugins})
# get_filename_component(_dir "${_qtp}" PATH)
# list(APPEND _qtdirs "${_dir}")
# endforeach ()
# copy qt plugins to bundle # # Get library paths
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so") # get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
file (GLOB_RECURSE _qtplugins "@QT_PLUGINS_DIR@/*.bundle")
foreach (_qtp ${_qtplugins})
get_filename_component(_dir "${_qtp}" PATH)
list(APPEND _qtdirs "${_dir}")
endforeach ()
# Get library paths # # fix all dependencies
get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH) # fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/QtViewer "${_qtplugins}" "/usr/lib;${_qtdirs};${_GlutDir}")
#
# fix all dependencies #endif()
fixup_bundle (@CMAKE_BINARY_DIR@/Build/bin/QtViewer "${_qtplugins}" "/usr/lib;${_qtdirs};${_GlutDir}")
endif()
# 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")