From 6d1de0c61797b10a26314ececee44e4a36e35d35 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 21 Jun 2014 18:15:27 +0200 Subject: [PATCH] Partially revert previous commits; ensure the bundle is fixed up correctly --- cockatrice/CMakeLists.txt | 4 +--- oracle/CMakeLists.txt | 4 +--- servatrice/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 535c5ac3..4303f567 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -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 diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 46502cc4..e42b154b 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -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 diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 9a66fe3b..5b65c2f9 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -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