From 4fc6831784eeea4912ba09b0475813e05177a74e Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 10 Jun 2014 11:42:41 +0200
Subject: [PATCH 1/2] Avoid using gcc-specific flags on not-gnu compilers

---
 cockatrice/CMakeLists.txt | 281 +++++++++++++++++++-------------------
 oracle/CMakeLists.txt     |   8 +-
 2 files changed, 150 insertions(+), 139 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 70de75a5..418becec 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -3,158 +3,158 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 PROJECT(cockatrice)
 
 SET(cockatrice_SOURCES
- src/abstractcounter.cpp 
- src/counter_general.cpp 
- src/dlg_creategame.cpp 
+ src/abstractcounter.cpp
+ src/counter_general.cpp
+ src/dlg_creategame.cpp
  src/dlg_filter_games.cpp
- src/dlg_connect.cpp 
- src/dlg_create_token.cpp 
+ src/dlg_connect.cpp
+ src/dlg_create_token.cpp
  src/dlg_edit_tokens.cpp
- src/abstractclient.cpp 
- src/remoteclient.cpp 
- src/main.cpp 
- src/window_main.cpp 
- src/gamesmodel.cpp 
- src/player.cpp 
- src/playertarget.cpp 
- src/cardzone.cpp 
- src/selectzone.cpp 
- src/cardlist.cpp 
- src/abstractcarditem.cpp 
- src/carditem.cpp 
- src/tablezone.cpp 
- src/handzone.cpp 
- src/handcounter.cpp 
- src/carddatabase.cpp 
- src/gameview.cpp 
- src/gameselector.cpp 
- src/decklistmodel.cpp 
- src/deck_loader.cpp 
- src/dlg_load_deck_from_clipboard.cpp 
- src/dlg_load_remote_deck.cpp 
- src/cardinfowidget.cpp 
- src/messagelogwidget.cpp 
- src/zoneviewzone.cpp 
- src/zoneviewwidget.cpp 
- src/pilezone.cpp 
- src/stackzone.cpp 
- src/carddragitem.cpp 
- src/carddatabasemodel.cpp 
- src/setsmodel.cpp 
- src/window_sets.cpp 
- src/abstractgraphicsitem.cpp 
- src/abstractcarddragitem.cpp 
- src/dlg_settings.cpp 
- src/dlg_cardsearch.cpp 
- src/phasestoolbar.cpp 
- src/gamescene.cpp 
- src/arrowitem.cpp 
- src/arrowtarget.cpp 
- src/tab.cpp 
- src/tab_server.cpp 
- src/tab_room.cpp 
- src/tab_message.cpp 
- src/tab_game.cpp 
- src/tab_deck_storage.cpp 
- src/tab_replays.cpp 
- src/tab_supervisor.cpp 
- src/tab_admin.cpp 
- src/tab_userlists.cpp 
+ src/abstractclient.cpp
+ src/remoteclient.cpp
+ src/main.cpp
+ src/window_main.cpp
+ src/gamesmodel.cpp
+ src/player.cpp
+ src/playertarget.cpp
+ src/cardzone.cpp
+ src/selectzone.cpp
+ src/cardlist.cpp
+ src/abstractcarditem.cpp
+ src/carditem.cpp
+ src/tablezone.cpp
+ src/handzone.cpp
+ src/handcounter.cpp
+ src/carddatabase.cpp
+ src/gameview.cpp
+ src/gameselector.cpp
+ src/decklistmodel.cpp
+ src/deck_loader.cpp
+ src/dlg_load_deck_from_clipboard.cpp
+ src/dlg_load_remote_deck.cpp
+ src/cardinfowidget.cpp
+ src/messagelogwidget.cpp
+ src/zoneviewzone.cpp
+ src/zoneviewwidget.cpp
+ src/pilezone.cpp
+ src/stackzone.cpp
+ src/carddragitem.cpp
+ src/carddatabasemodel.cpp
+ src/setsmodel.cpp
+ src/window_sets.cpp
+ src/abstractgraphicsitem.cpp
+ src/abstractcarddragitem.cpp
+ src/dlg_settings.cpp
+ src/dlg_cardsearch.cpp
+ src/phasestoolbar.cpp
+ src/gamescene.cpp
+ src/arrowitem.cpp
+ src/arrowtarget.cpp
+ src/tab.cpp
+ src/tab_server.cpp
+ src/tab_room.cpp
+ src/tab_message.cpp
+ src/tab_game.cpp
+ src/tab_deck_storage.cpp
+ src/tab_replays.cpp
+ src/tab_supervisor.cpp
+ src/tab_admin.cpp
+ src/tab_userlists.cpp
  src/tab_deck_editor.cpp
  src/replay_timeline_widget.cpp
  src/deckstats_interface.cpp
- src/chatview.cpp 
- src/userlist.cpp 
- src/userinfobox.cpp 
+ src/chatview.cpp
+ src/userlist.cpp
+ src/userinfobox.cpp
  src/user_context_menu.cpp
- src/remotedecklist_treewidget.cpp 
- src/remotereplaylist_treewidget.cpp 
- src/deckview.cpp 
- src/playerlistwidget.cpp 
- src/pixmapgenerator.cpp 
- src/settingscache.cpp 
- src/localserver.cpp 
- src/localserverinterface.cpp 
- src/localclient.cpp 
- src/priceupdater.cpp 
+ src/remotedecklist_treewidget.cpp
+ src/remotereplaylist_treewidget.cpp
+ src/deckview.cpp
+ src/playerlistwidget.cpp
+ src/pixmapgenerator.cpp
+ src/settingscache.cpp
+ src/localserver.cpp
+ src/localserverinterface.cpp
+ src/localclient.cpp
+ src/priceupdater.cpp
  src/qt-json/json.cpp
  src/soundengine.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
 )
 SET(cockatrice_HEADERS
- src/abstractcounter.h 
- src/counter_general.h 
- src/dlg_creategame.h 
- src/dlg_filter_games.h 
- src/dlg_connect.h 
- src/dlg_create_token.h 
+ src/abstractcounter.h
+ src/counter_general.h
+ src/dlg_creategame.h
+ src/dlg_filter_games.h
+ src/dlg_connect.h
+ src/dlg_create_token.h
  src/dlg_edit_tokens.h
- src/gamesmodel.h 
- src/abstractclient.h 
- src/remoteclient.h 
- src/window_main.h 
- src/cardzone.h 
- src/selectzone.h 
- src/player.h 
- src/playertarget.h 
- src/abstractcarditem.h 
- src/carditem.h 
- src/tablezone.h 
- src/handzone.h 
- src/handcounter.h 
- src/carddatabase.h 
- src/gameview.h 
- src/gameselector.h 
- src/decklistmodel.h 
- src/deck_loader.h 
- src/dlg_load_deck_from_clipboard.h 
- src/dlg_load_remote_deck.h 
- src/cardinfowidget.h 
- src/messagelogwidget.h 
- src/zoneviewzone.h 
- src/zoneviewwidget.h 
- src/pilezone.h 
- src/stackzone.h 
- src/carddragitem.h 
- src/carddatabasemodel.h 
- src/setsmodel.h 
- src/window_sets.h 
- src/abstractgraphicsitem.h 
- src/abstractcarddragitem.h 
- src/dlg_settings.h 
- src/dlg_cardsearch.h 
- src/phasestoolbar.h 
- src/gamescene.h 
- src/arrowitem.h 
- src/arrowtarget.h 
- src/tab.h 
- src/tab_server.h 
- src/tab_room.h 
- src/tab_message.h 
- src/tab_game.h 
- src/tab_deck_storage.h 
- src/tab_replays.h 
- src/tab_supervisor.h 
- src/tab_admin.h 
- src/tab_userlists.h 
+ src/gamesmodel.h
+ src/abstractclient.h
+ src/remoteclient.h
+ src/window_main.h
+ src/cardzone.h
+ src/selectzone.h
+ src/player.h
+ src/playertarget.h
+ src/abstractcarditem.h
+ src/carditem.h
+ src/tablezone.h
+ src/handzone.h
+ src/handcounter.h
+ src/carddatabase.h
+ src/gameview.h
+ src/gameselector.h
+ src/decklistmodel.h
+ src/deck_loader.h
+ src/dlg_load_deck_from_clipboard.h
+ src/dlg_load_remote_deck.h
+ src/cardinfowidget.h
+ src/messagelogwidget.h
+ src/zoneviewzone.h
+ src/zoneviewwidget.h
+ src/pilezone.h
+ src/stackzone.h
+ src/carddragitem.h
+ src/carddatabasemodel.h
+ src/setsmodel.h
+ src/window_sets.h
+ src/abstractgraphicsitem.h
+ src/abstractcarddragitem.h
+ src/dlg_settings.h
+ src/dlg_cardsearch.h
+ src/phasestoolbar.h
+ src/gamescene.h
+ src/arrowitem.h
+ src/arrowtarget.h
+ src/tab.h
+ src/tab_server.h
+ src/tab_room.h
+ src/tab_message.h
+ src/tab_game.h
+ src/tab_deck_storage.h
+ src/tab_replays.h
+ src/tab_supervisor.h
+ src/tab_admin.h
+ src/tab_userlists.h
  src/tab_deck_editor.h
  src/replay_timeline_widget.h
  src/deckstats_interface.h
- src/chatview.h 
- src/userlist.h 
- src/userinfobox.h 
+ src/chatview.h
+ src/userlist.h
+ src/userinfobox.h
  src/user_context_menu.h
- src/remotedecklist_treewidget.h 
- src/remotereplaylist_treewidget.h 
- src/deckview.h 
- src/playerlistwidget.h 
- src/settingscache.h 
- src/localserver.h 
- src/localserverinterface.h 
- src/localclient.h 
- src/priceupdater.h 
- src/soundengine.h 
- src/pending_command.h 
+ src/remotedecklist_treewidget.h
+ src/remotereplaylist_treewidget.h
+ src/deckview.h
+ src/playerlistwidget.h
+ src/settingscache.h
+ src/localserver.h
+ src/localserverinterface.h
+ src/localclient.h
+ src/priceupdater.h
+ src/soundengine.h
+ src/pending_command.h
 )
 
 if (UNIX AND NOT APPLE)
@@ -199,8 +199,13 @@ endif (NOT QT_QTMULTIMEDIA_FOUND)
 FIND_PACKAGE(Protobuf REQUIRED)
 FIND_PACKAGE(Threads)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+IF (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+ELSE (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+ENDIF (CMAKE_COMPILER_IS_GNUCC)
 
 # paths
 set(ICONDIR share/icons CACHE STRING "icon dir")
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 41338903..6f4e18c9 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -13,7 +13,13 @@ SET(QT_USE_QTSVG TRUE)
 FIND_PACKAGE(Qt4 REQUIRED)
 
 set(CMAKE_BUILD_TYPE Release)
-set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+IF (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+ELSE (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+ENDIF (CMAKE_COMPILER_IS_GNUCC)
 
 QT4_WRAP_CPP(oracle_HEADERS_MOC ${oracle_HEADERS})
 INCLUDE(${QT_USE_FILE})

From e2d17e983f658a8a076b83bb5456d75dffccf817 Mon Sep 17 00:00:00 2001
From: ctrlaltca <ctrlaltca@gmail.com>
Date: Tue, 10 Jun 2014 20:05:24 +0200
Subject: [PATCH 2/2] Restored whitespaces in CMakeLists.txt

---
 cockatrice/CMakeLists.txt | 272 +++++++++++++++++++-------------------
 1 file changed, 136 insertions(+), 136 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 418becec..0fcbc115 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -3,158 +3,158 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 PROJECT(cockatrice)
 
 SET(cockatrice_SOURCES
- src/abstractcounter.cpp
- src/counter_general.cpp
- src/dlg_creategame.cpp
+ src/abstractcounter.cpp 
+ src/counter_general.cpp 
+ src/dlg_creategame.cpp 
  src/dlg_filter_games.cpp
- src/dlg_connect.cpp
- src/dlg_create_token.cpp
+ src/dlg_connect.cpp 
+ src/dlg_create_token.cpp 
  src/dlg_edit_tokens.cpp
- src/abstractclient.cpp
- src/remoteclient.cpp
- src/main.cpp
- src/window_main.cpp
- src/gamesmodel.cpp
- src/player.cpp
- src/playertarget.cpp
- src/cardzone.cpp
- src/selectzone.cpp
- src/cardlist.cpp
- src/abstractcarditem.cpp
- src/carditem.cpp
- src/tablezone.cpp
- src/handzone.cpp
- src/handcounter.cpp
- src/carddatabase.cpp
- src/gameview.cpp
- src/gameselector.cpp
- src/decklistmodel.cpp
- src/deck_loader.cpp
- src/dlg_load_deck_from_clipboard.cpp
- src/dlg_load_remote_deck.cpp
- src/cardinfowidget.cpp
- src/messagelogwidget.cpp
- src/zoneviewzone.cpp
- src/zoneviewwidget.cpp
- src/pilezone.cpp
- src/stackzone.cpp
- src/carddragitem.cpp
- src/carddatabasemodel.cpp
- src/setsmodel.cpp
- src/window_sets.cpp
- src/abstractgraphicsitem.cpp
- src/abstractcarddragitem.cpp
- src/dlg_settings.cpp
- src/dlg_cardsearch.cpp
- src/phasestoolbar.cpp
- src/gamescene.cpp
- src/arrowitem.cpp
- src/arrowtarget.cpp
- src/tab.cpp
- src/tab_server.cpp
- src/tab_room.cpp
- src/tab_message.cpp
- src/tab_game.cpp
- src/tab_deck_storage.cpp
- src/tab_replays.cpp
- src/tab_supervisor.cpp
- src/tab_admin.cpp
- src/tab_userlists.cpp
+ src/abstractclient.cpp 
+ src/remoteclient.cpp 
+ src/main.cpp 
+ src/window_main.cpp 
+ src/gamesmodel.cpp 
+ src/player.cpp 
+ src/playertarget.cpp 
+ src/cardzone.cpp 
+ src/selectzone.cpp 
+ src/cardlist.cpp 
+ src/abstractcarditem.cpp 
+ src/carditem.cpp 
+ src/tablezone.cpp 
+ src/handzone.cpp 
+ src/handcounter.cpp 
+ src/carddatabase.cpp 
+ src/gameview.cpp 
+ src/gameselector.cpp 
+ src/decklistmodel.cpp 
+ src/deck_loader.cpp 
+ src/dlg_load_deck_from_clipboard.cpp 
+ src/dlg_load_remote_deck.cpp 
+ src/cardinfowidget.cpp 
+ src/messagelogwidget.cpp 
+ src/zoneviewzone.cpp 
+ src/zoneviewwidget.cpp 
+ src/pilezone.cpp 
+ src/stackzone.cpp 
+ src/carddragitem.cpp 
+ src/carddatabasemodel.cpp 
+ src/setsmodel.cpp 
+ src/window_sets.cpp 
+ src/abstractgraphicsitem.cpp 
+ src/abstractcarddragitem.cpp 
+ src/dlg_settings.cpp 
+ src/dlg_cardsearch.cpp 
+ src/phasestoolbar.cpp 
+ src/gamescene.cpp 
+ src/arrowitem.cpp 
+ src/arrowtarget.cpp 
+ src/tab.cpp 
+ src/tab_server.cpp 
+ src/tab_room.cpp 
+ src/tab_message.cpp 
+ src/tab_game.cpp 
+ src/tab_deck_storage.cpp 
+ src/tab_replays.cpp 
+ src/tab_supervisor.cpp 
+ src/tab_admin.cpp 
+ src/tab_userlists.cpp 
  src/tab_deck_editor.cpp
  src/replay_timeline_widget.cpp
  src/deckstats_interface.cpp
- src/chatview.cpp
- src/userlist.cpp
- src/userinfobox.cpp
+ src/chatview.cpp 
+ src/userlist.cpp 
+ src/userinfobox.cpp 
  src/user_context_menu.cpp
- src/remotedecklist_treewidget.cpp
- src/remotereplaylist_treewidget.cpp
- src/deckview.cpp
- src/playerlistwidget.cpp
- src/pixmapgenerator.cpp
- src/settingscache.cpp
- src/localserver.cpp
- src/localserverinterface.cpp
- src/localclient.cpp
- src/priceupdater.cpp
+ src/remotedecklist_treewidget.cpp 
+ src/remotereplaylist_treewidget.cpp 
+ src/deckview.cpp 
+ src/playerlistwidget.cpp 
+ src/pixmapgenerator.cpp 
+ src/settingscache.cpp 
+ src/localserver.cpp 
+ src/localserverinterface.cpp 
+ src/localclient.cpp 
+ src/priceupdater.cpp 
  src/qt-json/json.cpp
  src/soundengine.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
 )
 SET(cockatrice_HEADERS
- src/abstractcounter.h
- src/counter_general.h
- src/dlg_creategame.h
- src/dlg_filter_games.h
- src/dlg_connect.h
- src/dlg_create_token.h
+ src/abstractcounter.h 
+ src/counter_general.h 
+ src/dlg_creategame.h 
+ src/dlg_filter_games.h 
+ src/dlg_connect.h 
+ src/dlg_create_token.h 
  src/dlg_edit_tokens.h
- src/gamesmodel.h
- src/abstractclient.h
- src/remoteclient.h
- src/window_main.h
- src/cardzone.h
- src/selectzone.h
- src/player.h
- src/playertarget.h
- src/abstractcarditem.h
- src/carditem.h
- src/tablezone.h
- src/handzone.h
- src/handcounter.h
- src/carddatabase.h
- src/gameview.h
- src/gameselector.h
- src/decklistmodel.h
- src/deck_loader.h
- src/dlg_load_deck_from_clipboard.h
- src/dlg_load_remote_deck.h
- src/cardinfowidget.h
- src/messagelogwidget.h
- src/zoneviewzone.h
- src/zoneviewwidget.h
- src/pilezone.h
- src/stackzone.h
- src/carddragitem.h
- src/carddatabasemodel.h
- src/setsmodel.h
- src/window_sets.h
- src/abstractgraphicsitem.h
- src/abstractcarddragitem.h
- src/dlg_settings.h
- src/dlg_cardsearch.h
- src/phasestoolbar.h
- src/gamescene.h
- src/arrowitem.h
- src/arrowtarget.h
- src/tab.h
- src/tab_server.h
- src/tab_room.h
- src/tab_message.h
- src/tab_game.h
- src/tab_deck_storage.h
- src/tab_replays.h
- src/tab_supervisor.h
- src/tab_admin.h
- src/tab_userlists.h
+ src/gamesmodel.h 
+ src/abstractclient.h 
+ src/remoteclient.h 
+ src/window_main.h 
+ src/cardzone.h 
+ src/selectzone.h 
+ src/player.h 
+ src/playertarget.h 
+ src/abstractcarditem.h 
+ src/carditem.h 
+ src/tablezone.h 
+ src/handzone.h 
+ src/handcounter.h 
+ src/carddatabase.h 
+ src/gameview.h 
+ src/gameselector.h 
+ src/decklistmodel.h 
+ src/deck_loader.h 
+ src/dlg_load_deck_from_clipboard.h 
+ src/dlg_load_remote_deck.h 
+ src/cardinfowidget.h 
+ src/messagelogwidget.h 
+ src/zoneviewzone.h 
+ src/zoneviewwidget.h 
+ src/pilezone.h 
+ src/stackzone.h 
+ src/carddragitem.h 
+ src/carddatabasemodel.h 
+ src/setsmodel.h 
+ src/window_sets.h 
+ src/abstractgraphicsitem.h 
+ src/abstractcarddragitem.h 
+ src/dlg_settings.h 
+ src/dlg_cardsearch.h 
+ src/phasestoolbar.h 
+ src/gamescene.h 
+ src/arrowitem.h 
+ src/arrowtarget.h 
+ src/tab.h 
+ src/tab_server.h 
+ src/tab_room.h 
+ src/tab_message.h 
+ src/tab_game.h 
+ src/tab_deck_storage.h 
+ src/tab_replays.h 
+ src/tab_supervisor.h 
+ src/tab_admin.h 
+ src/tab_userlists.h 
  src/tab_deck_editor.h
  src/replay_timeline_widget.h
  src/deckstats_interface.h
- src/chatview.h
- src/userlist.h
- src/userinfobox.h
+ src/chatview.h 
+ src/userlist.h 
+ src/userinfobox.h 
  src/user_context_menu.h
- src/remotedecklist_treewidget.h
- src/remotereplaylist_treewidget.h
- src/deckview.h
- src/playerlistwidget.h
- src/settingscache.h
- src/localserver.h
- src/localserverinterface.h
- src/localclient.h
- src/priceupdater.h
- src/soundengine.h
- src/pending_command.h
+ src/remotedecklist_treewidget.h 
+ src/remotereplaylist_treewidget.h 
+ src/deckview.h 
+ src/playerlistwidget.h 
+ src/settingscache.h 
+ src/localserver.h 
+ src/localserverinterface.h 
+ src/localclient.h 
+ src/priceupdater.h 
+ src/soundengine.h 
+ src/pending_command.h 
 )
 
 if (UNIX AND NOT APPLE)