Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
87d4309a
Commit
87d4309a
authored
Jun 21, 2014
by
Fabio Bas
Browse files
Fix qt.conf file creation for "make package"
parent
501ef130
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
87d4309a
...
@@ -183,8 +183,10 @@ add_custom_command(
...
@@ -183,8 +183,10 @@ add_custom_command(
)
)
if
(
APPLE
)
if
(
APPLE
)
# this needs to be relative
set
(
plugin_dest_dir ./cockatrice.app/Contents/Plugins
)
set
(
plugin_dest_dir ./cockatrice.app/Contents/Plugins
)
set
(
qtconf_dest_dir ./cockatrice.app/Contents/Resources
)
# instead, this needs an absolute path (for make package to work)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
# note: phonon_backend => mediaservice
# note: phonon_backend => mediaservice
...
...
oracle/CMakeLists.txt
View file @
87d4309a
...
@@ -48,8 +48,10 @@ IF (NOT WIN32 AND NOT APPLE)
...
@@ -48,8 +48,10 @@ 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 ./oracle.app/Contents/Plugins
)
set
(
plugin_dest_dir ./oracle.app/Contents/Plugins
)
set
(
qtconf_dest_dir ./oracle.app/Contents/Resources
)
# instead, this needs an absolute path (for make)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/oracle.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
# note: phonon_backend => mediaservice
# note: phonon_backend => mediaservice
...
...
servatrice/CMakeLists.txt
View file @
87d4309a
...
@@ -55,8 +55,10 @@ elseif(WIN32)
...
@@ -55,8 +55,10 @@ elseif(WIN32)
endif
()
endif
()
if
(
APPLE
)
if
(
APPLE
)
# this needs to be relative
set
(
plugin_dest_dir ./servatrice.app/Contents/Plugins
)
set
(
plugin_dest_dir ./servatrice.app/Contents/Plugins
)
set
(
qtconf_dest_dir ./servatrice.app/Contents/Resources
)
# instead, this needs an absolute path (for make)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/servatrice.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
# note: phonon_backend => mediaservice
# note: phonon_backend => mediaservice
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment