Partially revert previous commits; ensure the bundle is fixed up correctly

This commit is contained in:
Fabio Bas 2014-06-21 18:15:27 +02:00
parent 1b2c839ff0
commit 6d1de0c617
3 changed files with 3 additions and 9 deletions

View file

@ -183,9 +183,7 @@ add_custom_command(
)
if(APPLE)
# this needs to be relative
set(plugin_dest_dir ./cockatrice.app/Contents/Plugins)
# instead, this needs an absolute path (for make package to work)
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Plugins)
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Resources)
# note: no codecs in qt5

View file

@ -48,9 +48,7 @@ IF (NOT WIN32 AND NOT APPLE)
ENDIF (NOT WIN32 AND NOT APPLE)
if(APPLE)
# this needs to be relative
set(plugin_dest_dir ./oracle.app/Contents/Plugins)
# instead, this needs an absolute path (for make)
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Plugins)
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
# note: no codecs in qt5

View file

@ -55,9 +55,7 @@ elseif(WIN32)
endif()
if(APPLE)
# this needs to be relative
set(plugin_dest_dir ./servatrice.app/Contents/Plugins)
# instead, this needs an absolute path (for make)
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Plugins)
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Resources)
# note: no codecs in qt5