From 482ad250a4454d993a98488edfe01d7f9dc35de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 6 Apr 2014 03:59:37 +0200 Subject: [PATCH] Workaround for dirty build folders. My disgust just turned into barely contained rage :< --- Config.cpp.in => BuildConfig.cpp.in | 2 +- Config.h => BuildConfig.h | 0 CMakeLists.txt | 6 +++--- MultiMC.cpp | 2 +- gui/MainWindow.cpp | 2 +- gui/dialogs/AboutDialog.cpp | 2 +- logic/MinecraftProcess.cpp | 2 +- logic/updater/DownloadUpdateTask.cpp | 2 +- logic/updater/NotificationChecker.cpp | 2 +- logic/updater/UpdateChecker.cpp | 2 +- tests/tst_UpdateChecker.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename Config.cpp.in => BuildConfig.cpp.in (98%) rename Config.h => BuildConfig.h (100%) diff --git a/Config.cpp.in b/BuildConfig.cpp.in similarity index 98% rename from Config.cpp.in rename to BuildConfig.cpp.in index 8051e1b4..1ea07374 100644 --- a/Config.cpp.in +++ b/BuildConfig.cpp.in @@ -1,4 +1,4 @@ -#include "Config.h" +#include "BuildConfig.h" Config BuildConfig; diff --git a/Config.h b/BuildConfig.h similarity index 100% rename from Config.h rename to BuildConfig.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f71e1156..d804e730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ IF(MultiMC_CODE_COVERAGE) ENDIF(MultiMC_CODE_COVERAGE) ######## Configure header ######## -configure_file("${PROJECT_SOURCE_DIR}/Config.cpp.in" "${PROJECT_BINARY_DIR}/Config.cpp") +configure_file("${PROJECT_SOURCE_DIR}/BuildConfig.cpp.in" "${PROJECT_BINARY_DIR}/BuildConfig.cpp") ######## Packaging/install paths setup ######## @@ -279,8 +279,8 @@ SET(MULTIMC_SOURCES MultiMC.h MultiMC.cpp MMCError.h -Config.h -${PROJECT_BINARY_DIR}/Config.cpp +BuildConfig.h +${PROJECT_BINARY_DIR}/BuildConfig.cpp # Logging logger/QsDebugOutput.cpp diff --git a/MultiMC.cpp b/MultiMC.cpp index 50a01f91..ddc1fca7 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -1,5 +1,5 @@ #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include #include diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index e4d28ca3..ce09c42d 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include "MainWindow.h" #include "ui_MainWindow.h" diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp index 944a61c8..9883aafb 100644 --- a/gui/dialogs/AboutDialog.cpp +++ b/gui/dialogs/AboutDialog.cpp @@ -18,7 +18,7 @@ #include #include "MultiMC.h" #include "gui/Platform.h" -#include "Config.h" +#include "BuildConfig.h" AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog) { diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp index 7b97b717..e43e5830 100644 --- a/logic/MinecraftProcess.cpp +++ b/logic/MinecraftProcess.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include "MinecraftProcess.h" diff --git a/logic/updater/DownloadUpdateTask.cpp b/logic/updater/DownloadUpdateTask.cpp index b7144539..e4cad73f 100644 --- a/logic/updater/DownloadUpdateTask.cpp +++ b/logic/updater/DownloadUpdateTask.cpp @@ -16,7 +16,7 @@ #include "DownloadUpdateTask.h" #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include "logic/updater/UpdateChecker.h" #include "logic/net/NetJob.h" diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp index 39da362b..5b458ddd 100644 --- a/logic/updater/NotificationChecker.cpp +++ b/logic/updater/NotificationChecker.cpp @@ -5,7 +5,7 @@ #include #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include "logic/net/CacheDownload.h" NotificationChecker::NotificationChecker(QObject *parent) diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp index 57ddfb0b..e47e1c4c 100644 --- a/logic/updater/UpdateChecker.cpp +++ b/logic/updater/UpdateChecker.cpp @@ -16,7 +16,7 @@ #include "UpdateChecker.h" #include "MultiMC.h" -#include "Config.h" +#include "BuildConfig.h" #include "logger/QsLog.h" diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp index 40232afe..ae6fc193 100644 --- a/tests/tst_UpdateChecker.cpp +++ b/tests/tst_UpdateChecker.cpp @@ -4,7 +4,7 @@ #include "depends/settings/settingsobject.h" #include "depends/settings/setting.h" -#include "Config.h" +#include "BuildConfig.h" #include "TestUtil.h" #include "logic/updater/UpdateChecker.h"