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
2eebddea
Commit
2eebddea
authored
Jun 22, 2014
by
Fabio Bas
Browse files
Port "make package" fix to oracle and servatrice
parent
2a5f6181
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
2eebddea
...
...
@@ -183,9 +183,8 @@ add_custom_command(
)
if
(
APPLE
)
# th
is
needs to be relative
# th
ese
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
...
...
oracle/CMakeLists.txt
View file @
2eebddea
...
...
@@ -48,10 +48,9 @@ IF (NOT WIN32 AND NOT APPLE)
ENDIF
(
NOT WIN32 AND NOT APPLE
)
if
(
APPLE
)
# th
is
needs to be relative
# th
ese
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
...
...
servatrice/CMakeLists.txt
View file @
2eebddea
...
...
@@ -55,10 +55,9 @@ elseif(WIN32)
endif
()
if
(
APPLE
)
# th
is
needs to be relative
# th
ese
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
)
...
...
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