aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Port "make package" fix to oracle and servatrice

Browse source
This commit is contained in:
Fabio Bas 2014-06-22 21:11:39 +02:00
parent 2a5f6181aa
commit 2eebddea9a
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/CMakeLists.txt
View file

@ -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

9
oracle/CMakeLists.txt
View file

@ -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

7
servatrice/CMakeLists.txt
View file

@ -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)