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

macOS: fix qt plugin installation (#3216)

Browse source 
* Osx: fix qt plugin installation

* Add make install step to travis debug build

* only install under osx

* Add "styles" plugins (for native look'n'feel)

* Osx: upgrade qt from 5.5 to current (5.10.1)

* Fix osx on travis

The qt homebrew formula now installs three qt* symlinks (qt, qt5, qt5@5.x) so we can't use/don't need bash globbing anymore
This commit is contained in:
ctrlaltca 2018-05-02 21:57:35 +02:00 committed by Zach H
parent 8a5baa4637
commit 2780270911
5 changed files with 108 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/travis-compile.sh
View file

@ -10,7 +10,7 @@ prefix=""
if [[ $TRAVIS_OS_NAME == "osx" ]]; then if [[ $TRAVIS_OS_NAME == "osx" ]]; then
export PATH="/usr/local/opt/ccache/bin:$PATH" export PATH="/usr/local/opt/ccache/bin:$PATH"
prefix="-DCMAKE_PREFIX_PATH=$(echo /usr/local/opt/qt*/)" prefix="-DCMAKE_PREFIX_PATH=$(echo /usr/local/opt/qt5/)"
fi fi
if [[ $TRAVIS_OS_NAME == "linux" ]]; then if [[ $TRAVIS_OS_NAME == "linux" ]]; then
prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)" prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)"
@ -21,6 +21,10 @@ if [[ $BUILDTYPE == "Debug" ]]; then
make -j2 make -j2
make test make test
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
make install
fi
if [[ $TRAVIS_OS_NAME == "linux" ]]; then if [[ $TRAVIS_OS_NAME == "linux" ]]; then
cd .. cd ..
clang-format -i \ clang-format -i \
@ -32,7 +36,7 @@ if [[ $BUILDTYPE == "Debug" ]]; then
oracle/src/*.cpp \ oracle/src/*.cpp \
servatrice/src/*.h \ servatrice/src/*.h \
servatrice/src/*.cpp servatrice/src/*.cpp
git clean -f git clean -f
git diff --quiet || ( git diff --quiet || (
echo "*****************************************************"; echo "*****************************************************";

2
.ci/travis-dependencies.sh
View file

@ -2,7 +2,7 @@
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew update brew update
brew install ccache clang-format protobuf qt@5.5 brew install ccache clang-format protobuf qt
fi fi
if [[ $TRAVIS_OS_NAME == "linux" ]] ; then if [[ $TRAVIS_OS_NAME == "linux" ]] ; then
echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds

146
cockatrice/CMakeLists.txt
View file

@ -5,12 +5,12 @@
PROJECT(Cockatrice) PROJECT(Cockatrice)
SET(cockatrice_SOURCES SET(cockatrice_SOURCES
src/abstractcounter.cpp src/abstractcounter.cpp
src/counter_general.cpp src/counter_general.cpp
src/dlg_creategame.cpp src/dlg_creategame.cpp
src/dlg_filter_games.cpp src/dlg_filter_games.cpp
src/dlg_connect.cpp src/dlg_connect.cpp
src/dlg_create_token.cpp src/dlg_create_token.cpp
src/dlg_edit_avatar.cpp src/dlg_edit_avatar.cpp
src/dlg_edit_password.cpp src/dlg_edit_password.cpp
src/dlg_edit_tokens.cpp src/dlg_edit_tokens.cpp
@ -18,35 +18,35 @@ SET(cockatrice_SOURCES
src/dlg_forgotpasswordrequest.cpp src/dlg_forgotpasswordrequest.cpp
src/dlg_forgotpasswordreset.cpp src/dlg_forgotpasswordreset.cpp
src/dlg_forgotpasswordchallenge.cpp src/dlg_forgotpasswordchallenge.cpp
src/dlg_register.cpp src/dlg_register.cpp
src/dlg_tip_of_the_day.cpp src/dlg_tip_of_the_day.cpp
src/tip_of_the_day.cpp src/tip_of_the_day.cpp
src/dlg_update.cpp src/dlg_update.cpp
src/dlg_viewlog.cpp src/dlg_viewlog.cpp
src/abstractclient.cpp src/abstractclient.cpp
src/remoteclient.cpp src/remoteclient.cpp
src/main.cpp src/main.cpp
src/window_main.cpp src/window_main.cpp
src/gamesmodel.cpp src/gamesmodel.cpp
src/player.cpp src/player.cpp
src/playertarget.cpp src/playertarget.cpp
src/cardzone.cpp src/cardzone.cpp
src/selectzone.cpp src/selectzone.cpp
src/cardlist.cpp src/cardlist.cpp
src/abstractcarditem.cpp src/abstractcarditem.cpp
src/carditem.cpp src/carditem.cpp
src/tablezone.cpp src/tablezone.cpp
src/handzone.cpp src/handzone.cpp
src/handcounter.cpp src/handcounter.cpp
src/carddatabase.cpp src/carddatabase.cpp
src/keysignals.cpp src/keysignals.cpp
src/gameview.cpp src/gameview.cpp
src/gameselector.cpp src/gameselector.cpp
src/decklistmodel.cpp src/decklistmodel.cpp
src/deck_loader.cpp src/deck_loader.cpp
src/dlg_load_deck_from_clipboard.cpp src/dlg_load_deck_from_clipboard.cpp
src/dlg_load_remote_deck.cpp src/dlg_load_remote_deck.cpp
src/cardinfowidget.cpp src/cardinfowidget.cpp
src/cardframe.cpp src/cardframe.cpp
src/cardinfopicture.cpp src/cardinfopicture.cpp
src/cardinfotext.cpp src/cardinfotext.cpp
@ -54,32 +54,32 @@ SET(cockatrice_SOURCES
src/cardfilter.cpp src/cardfilter.cpp
src/filtertreemodel.cpp src/filtertreemodel.cpp
src/filtertree.cpp src/filtertree.cpp
src/messagelogwidget.cpp src/messagelogwidget.cpp
src/zoneviewzone.cpp src/zoneviewzone.cpp
src/zoneviewwidget.cpp src/zoneviewwidget.cpp
src/pilezone.cpp src/pilezone.cpp
src/stackzone.cpp src/stackzone.cpp
src/carddragitem.cpp src/carddragitem.cpp
src/carddatabasemodel.cpp src/carddatabasemodel.cpp
src/setsmodel.cpp src/setsmodel.cpp
src/window_sets.cpp src/window_sets.cpp
src/abstractgraphicsitem.cpp src/abstractgraphicsitem.cpp
src/abstractcarddragitem.cpp src/abstractcarddragitem.cpp
src/dlg_settings.cpp src/dlg_settings.cpp
src/phasestoolbar.cpp src/phasestoolbar.cpp
src/gamescene.cpp src/gamescene.cpp
src/arrowitem.cpp src/arrowitem.cpp
src/arrowtarget.cpp src/arrowtarget.cpp
src/tab.cpp src/tab.cpp
src/tab_server.cpp src/tab_server.cpp
src/tab_room.cpp src/tab_room.cpp
src/tab_message.cpp src/tab_message.cpp
src/tab_game.cpp src/tab_game.cpp
src/tab_deck_storage.cpp src/tab_deck_storage.cpp
src/tab_replays.cpp src/tab_replays.cpp
src/tab_supervisor.cpp src/tab_supervisor.cpp
src/tab_admin.cpp src/tab_admin.cpp
src/tab_userlists.cpp src/tab_userlists.cpp
src/tab_deck_editor.cpp src/tab_deck_editor.cpp
src/tab_logs.cpp src/tab_logs.cpp
src/replay_timeline_widget.cpp src/replay_timeline_widget.cpp
@ -87,18 +87,18 @@ SET(cockatrice_SOURCES
src/tappedout_interface.cpp src/tappedout_interface.cpp
src/chatview/chatview.cpp src/chatview/chatview.cpp
src/chatview/userlistProxy.h src/chatview/userlistProxy.h
src/userlist.cpp src/userlist.cpp
src/userinfobox.cpp src/userinfobox.cpp
src/user_context_menu.cpp src/user_context_menu.cpp
src/remotedecklist_treewidget.cpp src/remotedecklist_treewidget.cpp
src/remotereplaylist_treewidget.cpp src/remotereplaylist_treewidget.cpp
src/deckview.cpp src/deckview.cpp
src/playerlistwidget.cpp src/playerlistwidget.cpp
src/pixmapgenerator.cpp src/pixmapgenerator.cpp
src/settingscache.cpp src/settingscache.cpp
src/thememanager.cpp src/thememanager.cpp
src/localserver.cpp src/localserver.cpp
src/localserverinterface.cpp src/localserverinterface.cpp
src/localclient.cpp src/localclient.cpp
src/qt-json/json.cpp src/qt-json/json.cpp
src/soundengine.cpp src/soundengine.cpp
@ -239,7 +239,7 @@ if(UNIX)
set_target_properties(cockatrice PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) set_target_properties(cockatrice PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist)
INSTALL(TARGETS cockatrice BUNDLE DESTINATION ./) INSTALL(TARGETS cockatrice BUNDLE DESTINATION ./)
INSTALL(FILES ${cockatrice_QM} DESTINATION ./Cockatrice.app/Contents/Resources/translations) INSTALL(FILES ${cockatrice_QM} DESTINATION ./cockatrice.app/Contents/Resources/translations)
else() else()
# Assume linux # Assume linux
INSTALL(TARGETS cockatrice RUNTIME DESTINATION bin/) INSTALL(TARGETS cockatrice RUNTIME DESTINATION bin/)
@ -255,14 +255,22 @@ endif()
if(APPLE) if(APPLE)
# these needs to be relative to CMAKE_INSTALL_PREFIX # these needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir Cockatrice.app/Contents/Plugins) set(plugin_dest_dir cockatrice.app/Contents/Plugins)
set(qtconf_dest_dir Cockatrice.app/Contents/Resources) set(qtconf_dest_dir cockatrice.app/Contents/Resources)
get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
# qt5 plugins: audio, iconengines, imageformats, platforms, printsupport # qt5 plugins: audio, iconengines, imageformats, platforms, printsupport
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
FILES_MATCHING REGEX "(audio|iconengines|imageformats|platforms|printsupport)/.*\\.dylib" FILES_MATCHING
REGEX ".*_debug\\.dylib" EXCLUDE) PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE
PATTERN "audio/*.dylib"
PATTERN "iconengines/*.dylib"
PATTERN "imageformats/*.dylib"
PATTERN "platforms/*.dylib"
PATTERN "printsupport/*.dylib"
PATTERN "styles/*.dylib"
)
install(CODE " install(CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@ -276,7 +284,7 @@ Data = Resources\")
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()

21
oracle/CMakeLists.txt
View file

@ -21,7 +21,7 @@ SET(oracle_SOURCES
../cockatrice/src/settings/messagesettings.cpp ../cockatrice/src/settings/messagesettings.cpp
../cockatrice/src/settings/gamefilterssettings.cpp ../cockatrice/src/settings/gamefilterssettings.cpp
../cockatrice/src/settings/layoutssettings.cpp ../cockatrice/src/settings/layoutssettings.cpp
../cockatrice/src/thememanager.cpp ../cockatrice/src/thememanager.cpp
../cockatrice/src/qt-json/json.cpp ../cockatrice/src/qt-json/json.cpp
../cockatrice/src/releasechannel.cpp ../cockatrice/src/releasechannel.cpp
${VERSION_STRING_CPP} ${VERSION_STRING_CPP}
@ -128,7 +128,7 @@ if(UNIX)
set_target_properties(oracle PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) set_target_properties(oracle PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist)
INSTALL(TARGETS oracle BUNDLE DESTINATION ./) INSTALL(TARGETS oracle BUNDLE DESTINATION ./)
INSTALL(FILES ${oracle_QM} DESTINATION ./Oracle.app/Contents/Resources/translations) INSTALL(FILES ${oracle_QM} DESTINATION ./oracle.app/Contents/Resources/translations)
else() else()
# Assume linux # Assume linux
INSTALL(TARGETS oracle RUNTIME DESTINATION bin/) INSTALL(TARGETS oracle RUNTIME DESTINATION bin/)
@ -147,14 +147,19 @@ ENDIF (NOT WIN32 AND NOT APPLE)
if(APPLE) if(APPLE)
# these needs to be relative to CMAKE_INSTALL_PREFIX # these needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir Oracle.app/Contents/Plugins) set(plugin_dest_dir oracle.app/Contents/Plugins)
set(qtconf_dest_dir Oracle.app/Contents/Resources) set(qtconf_dest_dir oracle.app/Contents/Resources)
get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
# qt5 plugins: iconengines, platforms # qt5 plugins: iconengines, platforms
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
FILES_MATCHING REGEX "(iconengines|platforms)/.*\\.dylib" FILES_MATCHING
REGEX ".*_debug\\.dylib" EXCLUDE) PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE
PATTERN "iconengines/*.dylib"
PATTERN "platforms/*.dylib"
PATTERN "styles/*.dylib"
)
install(CODE " install(CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@ -167,7 +172,7 @@ Translations = Resources/translations\")
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()
@ -203,4 +208,4 @@ Translations = Resources/translations\")
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()

18
servatrice/CMakeLists.txt
View file

@ -127,8 +127,8 @@ if(UNIX)
set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
INSTALL(TARGETS servatrice BUNDLE DESTINATION ./) INSTALL(TARGETS servatrice BUNDLE DESTINATION ./)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.ini.example DESTINATION ./Servatrice.app/Contents/Resources/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.ini.example DESTINATION ./servatrice.app/Contents/Resources/)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.sql DESTINATION ./Servatrice.app/Contents/Resources/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.sql DESTINATION ./servatrice.app/Contents/Resources/)
else() else()
# Assume linux # Assume linux
INSTALL(TARGETS servatrice RUNTIME DESTINATION bin/) INSTALL(TARGETS servatrice RUNTIME DESTINATION bin/)
@ -147,14 +147,18 @@ endif()
if(APPLE) if(APPLE)
# these needs to be relative to CMAKE_INSTALL_PREFIX # these needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir Servatrice.app/Contents/Plugins) set(plugin_dest_dir servatrice.app/Contents/Plugins)
set(qtconf_dest_dir Servatrice.app/Contents/Resources) set(qtconf_dest_dir servatrice.app/Contents/Resources)
get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
# qt5 plugins: platforms, sqldrivers/mysql # qt5 plugins: platforms, sqldrivers/mysql
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
FILES_MATCHING REGEX "(platforms/.*|sqldrivers/libqsqlmysql)\\.dylib" FILES_MATCHING
REGEX ".*_debug\\.dylib" EXCLUDE) PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE
PATTERN "platforms/*.dylib"
PATTERN "sqldrivers/libqsqlmysql*.dylib"
)
install(CODE " install(CODE "
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@ -167,7 +171,7 @@ Translations = Resources/translations\")
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Servatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()