now using new common cmakefiles

fixed includes because shared/ isn't in the path anymore
removed unused modeltest files

CMakeLists.txt

@@ -1,39 +1,13 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16)
 
-ADD_COMPILE_OPTIONS(
-	$<$<CXX_COMPILER_ID:MSVC>:/MP>
-	$<$<CXX_COMPILER_ID:MSVC>:/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING>
-	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>>
-	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+project(organizer)
+set(project_type exe)
+set(executable_name ModOrganizer)
 
-PROJECT(organizer)
+include(../cmake_common/project.cmake)
 
-# sets ModOrganizer as StartUp Project in Visual Studio
-set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT "ModOrganizer")
+set(additional_translations ${uibase_path}/src)
 
-set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
-set(CMAKE_INSTALL_MESSAGE NEVER)
+add_subdirectory(src)
 
-SET(DEPENDENCIES_DIR CACHE PATH "")
-
-# hint to find qt in dependencies path
-LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
-LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)
-LIST(APPEND CMAKE_PREFIX_PATH ${FMT_ROOT}/build)
-
-ADD_SUBDIRECTORY(src)
-
-set(vcxproj_user_file "${CMAKE_CURRENT_BINARY_DIR}/INSTALL.vcxproj.user")
-if(NOT EXISTS ${vcxproj_user_file})
-	FILE(WRITE ${vcxproj_user_file}
-		"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-			"<Project ToolsVersion=\"Current\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
-			  "<PropertyGroup>\n"
-				"<LocalDebuggerWorkingDirectory>${CMAKE_INSTALL_PREFIX}/bin</LocalDebuggerWorkingDirectory>\n"
-				"<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>"
-				"<LocalDebuggerCommand>${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe</LocalDebuggerCommand>\n"
-			  "</PropertyGroup>\n"
-			"</Project>\n")
-endif()
-
-INSTALL(FILES dump_running_process.bat DESTINATION bin)
+install(FILES dump_running_process.bat DESTINATION bin)

src/aboutdialog.cpp

@@ -20,7 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
-#include "util.h"
+#include "shared/util.h"
 #include <utility.h>
 
 #include <QApplication>

src/activatemodsdialog.h

@@ -53,7 +53,7 @@ public:
 
   /**
    * @brief get a list of mods that the user chose to activate
-   * 
+   *
    * @note This can of ocurse only be called after the dialog has been displayed
    *
    * @return set< QString > the mods to activate

src/directoryrefresher.cpp

@@ -29,7 +29,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settings.h"
 #include "envfs.h"
 #include "modinfodialogfwd.h"
-#include "util.h"
+#include "shared/util.h"
 
 #include <gameplugins.h>
 

src/directoryrefresher.h

@@ -20,7 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DIRECTORYREFRESHER_H
 #define DIRECTORYREFRESHER_H
 
-#include "fileregisterfwd.h"
+#include "shared/fileregisterfwd.h"
 #include "profile.h"
 #include <QObject>
 #include <QMutex>

src/editexecutablesdialog.cpp

@@ -20,7 +20,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "editexecutablesdialog.h"
 #include "ui_editexecutablesdialog.h"
 #include "filedialogmemory.h"
-#include "stackdata.h"
 #include "modlist.h"
 #include "forcedloaddialog.h"
 #include "organizercore.h"
@@ -74,9 +73,9 @@ EditExecutablesDialog::EditExecutablesDialog(OrganizerCore& oc, int sel, QWidget
 
   for (auto&& m : m_organizerCore.modList()->allMods()) {
     auto mod = ModInfo::getByName(m);
-    if (!mod->hasAnyOfTheseFlags({ ModInfo::FLAG_FOREIGN, 
-                                   ModInfo::FLAG_BACKUP, 
-                                   ModInfo::FLAG_OVERWRITE, 
+    if (!mod->hasAnyOfTheseFlags({ ModInfo::FLAG_FOREIGN,
+                                   ModInfo::FLAG_BACKUP,
+                                   ModInfo::FLAG_OVERWRITE,
                                    ModInfo::FLAG_SEPARATOR })) {
       ui->mods->addItem(m);
     }

src/envfs.cpp

@@ -1,6 +1,6 @@
 #include "envfs.h"
 #include "env.h"
-#include "util.h"
+#include "shared/util.h"
 #include <utility.h>
 #include <log.h>
 

src/filetreeitem.cpp

@@ -1,7 +1,7 @@
 #include "filetreeitem.h"
 #include "filetreemodel.h"
 #include "modinfo.h"
-#include "util.h"
+#include "shared/util.h"
 #include "modinfodialogfwd.h"
 #include <log.h>
 #include <utility.h>

src/filetreemodel.cpp

@@ -1,7 +1,7 @@
 #include "filetreemodel.h"
 #include "organizercore.h"
-#include "filesorigin.h"
-#include "util.h"
+#include "shared/filesorigin.h"
+#include "shared/util.h"
 #include "shared/directoryentry.h"
 #include "shared/fileentry.h"
 #include <log.h>

src/iconfetcher.cpp

@@ -1,5 +1,5 @@
 #include "iconfetcher.h"
-#include "util.h"
+#include "shared/util.h"
 
 void IconFetcher::Waiter::wait()
 {

src/instancemanager.cpp

@@ -22,7 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "selectiondialog.h"
 #include <utility.h>
 #include <log.h>
-#include <appconfig.h>
+#include "shared/appconfig.h"
 #include <QCoreApplication>
 #include <QDir>
 #include <QStandardPaths>

src/loadmechanism.cpp

@@ -19,10 +19,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "loadmechanism.h"
 #include "utility.h"
-#include "util.h"
+#include "shared/util.h"
 #include <iplugingame.h>
 #include <scriptextender.h>
-#include <appconfig.h>
+#include "shared/appconfig.h"
 #include <log.h>
 #include <QFile>
 #include <QFileInfo>

src/main.cpp

@@ -27,7 +27,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <windows.h>
 #include <DbgHelp.h>
 
-#include <appconfig.h>
+#include "shared/appconfig.h"
 #include <utility.h>
 #include <scopeguard.h>
 #include "mainwindow.h"
@@ -48,10 +48,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "organizercore.h"
 #include "env.h"
 #include "envmodule.h"
-#include "util.h"
+#include "shared/util.h"
 
 #include <eh.h>
-#include <windows_error.h>
+#include "shared/windows_error.h"
 #include <usvfs.h>
 #include <log.h>
 

src/mainwindow.cpp

@@ -71,7 +71,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialog.h"
 #include <safewritefile.h>
 #include "nxmaccessmanager.h"
-#include "appconfig.h"
+#include "shared/appconfig.h"
 #include "eventfilter.h"
 #include "statusbar.h"
 #include "filterlist.h"

src/moapplication.cpp

@@ -21,7 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <report.h>
 #include <utility.h>
 #include <log.h>
-#include <appconfig.h>
+#include "shared/appconfig.h"
 #include <QFile>
 #include <QStringList>
 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)

src/modeltest.h

@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef MODELTEST_H
-#define MODELTEST_H
-
-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
-
-class ModelTest : public QObject
-{
-  Q_OBJECT
-
-public:
-  ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
-
-private Q_SLOTS:
-  void nonDestructiveBasicTest();
-  void rowCount();
-  void columnCount();
-  void hasIndex();
-  void index();
-  void parent();
-  void data();
-
-protected Q_SLOTS:
-  void runAllTests();
-  void layoutAboutToBeChanged();
-  void layoutChanged();
-  void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end );
-  void rowsInserted( const QModelIndex & parent, int start, int end );
-  void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end );
-  void rowsRemoved( const QModelIndex & parent, int start, int end );
-
-private:
-  void checkChildren( const QModelIndex &parent, int currentDepth = 0 );
-
-  QAbstractItemModel *model;
-
-  struct Changing {
-    QModelIndex parent;
-    int oldSize;
-    QVariant last;
-    QVariant next;
-  };
-  QStack<Changing> insert;
-  QStack<Changing> remove;
-
-  bool fetchingMore;
-
-  QList<QPersistentModelIndex> changing;
-};
-
-#endif

src/modinfo.cpp

@@ -34,7 +34,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iplugingame.h>
 #include <versioninfo.h>
-#include <appconfig.h>
+#include "shared/appconfig.h"
 #include <scriptextender.h>
 #include <unmanagedmods.h>
 #include <log.h>

src/modinfooverwrite.cpp

@@ -1,6 +1,6 @@
 #include "modinfooverwrite.h"
 
-#include "appconfig.h"
+#include "shared/appconfig.h"
 #include "settings.h"
 
 #include <QApplication>