diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index f6066926..170721b4 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -183,9 +183,8 @@ add_custom_command( ) if(APPLE) - # this needs to be relative + # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir cockatrice.app/Contents/Plugins) - # instead, this needs an absolute path (for make package to work) set(qtconf_dest_dir cockatrice.app/Contents/Resources) # note: no codecs in qt5 diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 55b63050..05bcd494 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -48,10 +48,9 @@ IF (NOT WIN32 AND NOT APPLE) ENDIF (NOT WIN32 AND NOT APPLE) if(APPLE) - # this needs to be relative + # these needs to be relative to CMAKE_INSTALL_PREFIX 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 oracle.app/Contents/Resources) # note: no codecs in qt5 # note: phonon_backend => mediaservice @@ -66,10 +65,10 @@ if(APPLE) endif() install(CODE " - file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") - " COMPONENT Runtime) + " COMPONENT Runtime) install(CODE " file(GLOB_RECURSE QTPLUGINS diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 8c44c05b..c1aefed1 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -55,10 +55,9 @@ elseif(WIN32) endif() if(APPLE) - # this needs to be relative + # these needs to be relative to CMAKE_INSTALL_PREFIX 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 servatrice.app/Contents/Resources) # note: no codecs in qt5 # note: phonon_backend => mediaservice @@ -73,7 +72,7 @@ if(APPLE) endif() install(CODE " - file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " COMPONENT Runtime)