mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-01 02:53:56 -07:00
This finally fixes both make install and make package
This commit is contained in:
parent
6d1de0c617
commit
b44365b73c
3 changed files with 21 additions and 12 deletions
|
|
@ -55,7 +55,9 @@ elseif(WIN32)
|
|||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Plugins)
|
||||
# this needs to be relative
|
||||
set(plugin_dest_dir servatrice.app/Contents/Plugins)
|
||||
# instead, this needs an absolute path (for make)
|
||||
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Resources)
|
||||
|
||||
# note: no codecs in qt5
|
||||
|
|
@ -72,12 +74,13 @@ if(APPLE)
|
|||
|
||||
install(CODE "
|
||||
file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||
Plugins = Plugins\")
|
||||
Plugins = Plugins
|
||||
Translations = Resources/translations\")
|
||||
" COMPONENT Runtime)
|
||||
|
||||
install(CODE "
|
||||
file(GLOB_RECURSE QTPLUGINS
|
||||
\"${plugin_dest_dir}/*.dylib\")
|
||||
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue