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
b44365b7
Commit
b44365b7
authored
Jun 21, 2014
by
Fabio Bas
Browse files
This finally fixes both make install and make package
parent
6d1de0c6
Changes
3
Show whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
b44365b7
...
...
@@ -183,8 +183,10 @@ add_custom_command(
)
if
(
APPLE
)
set
(
plugin_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Plugins
)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Resources
)
# 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
(
qtconf_dest_dir cockatrice.app/Contents/Resources
)
# note: no codecs in qt5
# note: phonon_backend => mediaservice
...
...
@@ -199,13 +201,14 @@ if(APPLE)
endif
()
install
(
CODE
"
file(WRITE
\"
${
qtconf_dest_dir
}
/qt.conf
\"
\"
[Paths]
Plugins = Plugins
\"
)
file(WRITE
\"\$
{CMAKE_INSTALL_PREFIX}/
${
qtconf_dest_dir
}
/qt.conf
\"
\"
[Paths]
Plugins = Plugins
Translations = Resources/translations
\"
)
"
COMPONENT Runtime
)
install
(
CODE
"
file(GLOB_RECURSE QTPLUGINS
\"
${
plugin_dest_dir
}
/*.dylib
\"
)
\"
\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/*.dylib
\"
)
set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/cockatrice.app
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
...
...
oracle/CMakeLists.txt
View file @
b44365b7
...
...
@@ -48,7 +48,9 @@ IF (NOT WIN32 AND NOT APPLE)
ENDIF
(
NOT WIN32 AND NOT APPLE
)
if
(
APPLE
)
set
(
plugin_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/oracle.app/Contents/Plugins
)
# this needs to be relative
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
)
# note: no codecs in qt5
...
...
@@ -65,12 +67,13 @@ if(APPLE)
install
(
CODE
"
file(WRITE
\"
${
qtconf_dest_dir
}
/qt.conf
\"
\"
[Paths]
Plugins = Plugins
\"
)
Plugins = Plugins
Translations = Resources/translations
\"
)
"
COMPONENT Runtime
)
install
(
CODE
"
file(GLOB_RECURSE QTPLUGINS
\"
${
plugin_dest_dir
}
/*.dylib
\"
)
\"
\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/*.dylib
\"
)
set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/oracle.app
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
...
...
servatrice/CMakeLists.txt
View file @
b44365b7
...
...
@@ -55,7 +55,9 @@ elseif(WIN32)
endif
()
if
(
APPLE
)
set
(
plugin_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/servatrice.app/Contents/Plugins
)
# this needs to be relative
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
)
# note: no codecs in qt5
...
...
@@ -72,12 +74,13 @@ if(APPLE)
install
(
CODE
"
file(WRITE
\"
${
qtconf_dest_dir
}
/qt.conf
\"
\"
[Paths]
Plugins = Plugins
\"
)
Plugins = Plugins
Translations = Resources/translations
\"
)
"
COMPONENT Runtime
)
install
(
CODE
"
file(GLOB_RECURSE QTPLUGINS
\"
${
plugin_dest_dir
}
/*.dylib
\"
)
\"
\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/*.dylib
\"
)
set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/servatrice.app
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
...
...
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