Commit 6d1de0c6 authored by Fabio Bas's avatar Fabio Bas
Browse files

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

parent 1b2c839f
...@@ -183,9 +183,7 @@ add_custom_command( ...@@ -183,9 +183,7 @@ add_custom_command(
) )
if(APPLE) if(APPLE)
# this needs to be relative set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Plugins)
set(plugin_dest_dir ./cockatrice.app/Contents/Plugins)
# instead, this needs an absolute path (for make package to work)
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Resources) set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Resources)
# note: no codecs in qt5 # note: no codecs in qt5
......
...@@ -48,9 +48,7 @@ IF (NOT WIN32 AND NOT APPLE) ...@@ -48,9 +48,7 @@ IF (NOT WIN32 AND NOT APPLE)
ENDIF (NOT WIN32 AND NOT APPLE) ENDIF (NOT WIN32 AND NOT APPLE)
if(APPLE) if(APPLE)
# this needs to be relative set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Plugins)
set(plugin_dest_dir ./oracle.app/Contents/Plugins)
# instead, this needs an absolute path (for make)
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources) set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
# note: no codecs in qt5 # note: no codecs in qt5
......
...@@ -55,9 +55,7 @@ elseif(WIN32) ...@@ -55,9 +55,7 @@ elseif(WIN32)
endif() endif()
if(APPLE) if(APPLE)
# this needs to be relative set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Plugins)
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) set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Resources)
# note: no codecs in qt5 # note: no codecs in qt5
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment