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
6d1de0c6
Commit
6d1de0c6
authored
Jun 21, 2014
by
Fabio Bas
Browse files
Partially revert previous commits; ensure the bundle is fixed up correctly
parent
1b2c839f
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
6d1de0c6
...
@@ -183,9 +183,7 @@ add_custom_command(
...
@@ -183,9 +183,7 @@ add_custom_command(
)
)
if
(
APPLE
)
if
(
APPLE
)
# this needs to be relative
set
(
plugin_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Plugins
)
set
(
plugin_dest_dir ./cockatrice.app/Contents/Plugins
)
# instead, this needs an absolute path (for make package to work)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Resources
)
set
(
qtconf_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/cockatrice.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
...
...
oracle/CMakeLists.txt
View file @
6d1de0c6
...
@@ -48,9 +48,7 @@ IF (NOT WIN32 AND NOT APPLE)
...
@@ -48,9 +48,7 @@ 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
${
CMAKE_INSTALL_PREFIX
}
/oracle.app/Contents/Plugins
)
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
${
CMAKE_INSTALL_PREFIX
}
/oracle.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
...
...
servatrice/CMakeLists.txt
View file @
6d1de0c6
...
@@ -55,9 +55,7 @@ elseif(WIN32)
...
@@ -55,9 +55,7 @@ elseif(WIN32)
endif
()
endif
()
if
(
APPLE
)
if
(
APPLE
)
# this needs to be relative
set
(
plugin_dest_dir
${
CMAKE_INSTALL_PREFIX
}
/servatrice.app/Contents/Plugins
)
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
${
CMAKE_INSTALL_PREFIX
}
/servatrice.app/Contents/Resources
)
# note: no codecs in qt5
# note: no codecs in qt5
...
...
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