speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix packaging for Mac OS

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6907 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 99d6f1dfb512e73616b26cdc2a50b35aa28fc3f2
Former-commit-id: 617f4348b3bd800a8332ce2cb3c15255dc4b1595
This commit is contained in:
beaglejoe 2020-04-11 23:39:40 +00:00
parent abedb23e91
commit 4fc9a3df18
2 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
cmake/fixbundle.cmake.in
View file

@ -18,35 +18,17 @@
INCLUDE(BundleUtilities)
SET(BU_CHMOD_BUNDLE_ITEMS ON)
SET(bundle "@CMAKE_BINARY_DIR@/@CMAKE_INSTALL_PREFIX@/@SD_BINDIR@/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@")
SET(bundle "@_bundle@")
SET(loadables @SD_MODULE_LIST_ITEMS@)
SET(robots @SD_ROBOT_LIST_ITEMS@)
SET(osg_plugins @SD_OSG_PLUGIN_LIST_ITEMS@)
SET(plugins )
#SET(loadables @SD_MODULE_LIST_ITEMS@)
#SET(robots @SD_ROBOT_LIST_ITEMS@)
#SET(osg_plugins @SD_OSG_PLUGIN_LIST_ITEMS@)
SET(plugins "@_loadables@")
SET(_prefix_path @CMAKE_PREFIX_PATH@)
foreach(_MODULE ${loadables})
#message(STATUS "${_MODULE}")
LIST(APPEND plugins "@CMAKE_BINARY_DIR@/@CMAKE_INSTALL_PREFIX@/${_MODULE}")
endforeach()
foreach(_ROBOT ${robots})
#message(STATUS "${_ROBOT}")
LIST(APPEND plugins "@CMAKE_BINARY_DIR@/@CMAKE_INSTALL_PREFIX@/${_ROBOT}")
endforeach()
foreach(_PLUGIN ${osg_plugins})
#message(STATUS "${_PLUGIN}")
LIST(APPEND plugins "@CMAKE_BINARY_DIR@/@CMAKE_INSTALL_PREFIX@/${_PLUGIN}")
endforeach()
#message(STATUS "plugins...")
#foreach(_MODULE ${plugins})
# message(STATUS "plugins = ${_MODULE}")
#endforeach()
# TODO - APPLE specific ?
SET(search_dirs )
@ -56,7 +38,7 @@ ENDIF(_prefix_path)
LIST(APPEND search_dirs "@CMAKE_BINARY_DIR@/@CMAKE_INSTALL_PREFIX@")
LIST(APPEND search_dirs "@CMAKE_INSTALL_PREFIX@/Frameworks")
LIST(APPEND search_dirs "@CMAKE_INSTALL_PREFIX@/MacOS")
LIST(APPEND search_dirs "@CMAKE_INSTALL_PREFIX@/lib64/games/speed-dreams-2/lib")
LIST(APPEND search_dirs "@CMAKE_INSTALL_PREFIX@/lib64/games/@PROJECT_NAME@/lib")
LIST(APPEND search_dirs "@CMAKE_INSTALL_PREFIX@/games/Plugins/@OSG_PLUGIN_DIR@")

9
packaging/CMakeLists.txt
View file

@ -64,13 +64,18 @@ IF((APPLE) AND ("${CMAKE_INSTALL_PREFIX}" MATCHES "\\.app$"))
endforeach()
foreach(_ROBOT ${SD_ROBOT_LIST_ITEMS})
LIST(APPEND _loadables "${CMAKE_INSTALL_PREFIX}/${_MODULE}")
LIST(APPEND _loadables "${CMAKE_INSTALL_PREFIX}/${_ROBOT}")
endforeach()
foreach(_PLUGIN ${SD_OSG_PLUGIN_LIST_ITEMS})
#message(STATUS "${_PLUGIN}")
LIST(APPEND _loadables "@CMAKE_INSTALL_PREFIX@/${_PLUGIN}")
endforeach()
#================
# TODO figure out if this is needed...
IF(NOT OPTION_OFFICIAL_ONLY)
LIST(APPEND _loadables "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/lib/libephemeris.dylib")
LIST(APPEND _loadables "${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/lib/libephemeris.dylib")
ENDIF(NOT OPTION_OFFICIAL_ONLY)
LIST(APPEND _loadables "${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/lib/liblearning.dylib")
#================