NOISSUE clean up some old cmake messes

6 files changed, 36 insertions, 78 deletions

diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt
index 40adae7e..e8646e1c 100644
--- a/depends/util/CMakeLists.txt
+++ b/depends/util/CMakeLists.txt
@@ -1,42 +1,28 @@
-project(libUtil)
+project(MultiMC_util)
 
-include(UseCXX14)
 include(Coverage)
 
 # Find Qt
 find_package(Qt5Core REQUIRED)
-
-# Include Qt headers.
-include_directories(${Qt5Base_INCLUDE_DIRS})
+find_package(Qt5Gui REQUIRED)
 
 set(LIBUTIL_SOURCES
-	include/libutil_config.h
-
-	include/pathutils.h
 	src/pathutils.cpp
-
-	include/osutils.h
-
-	include/userutils.h
 	src/userutils.cpp
-
-	include/cmdutils.h
 	src/cmdutils.cpp
-
-	include/modutils.h
 	src/modutils.cpp
+	include/cmdutils.h
+	include/modutils.h
+	include/osutils.h
+	include/pathutils.h
+	include/userutils.h
 )
 
-# Set the include dir path.
-set(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
-
-# Static link!
-add_definitions(-DLIBUTIL_STATIC)
-
-add_definitions(-DLIBUTIL_LIBRARY)
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_library(libUtil STATIC ${LIBUTIL_SOURCES})
-qt5_use_modules(libUtil Core)
-target_link_libraries(libUtil)
+add_library(MultiMC_util STATIC ${LIBUTIL_SOURCES})
+
+qt5_use_modules(MultiMC_util Core Gui)
+generate_export_header(MultiMC_util)
+target_include_directories(MultiMC_util PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set_property(TARGET MultiMC_util PROPERTY CXX_STANDARD 14)
diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h
index 56ae4edb..8bf39eaa 100644
--- a/depends/util/include/cmdutils.h
+++ b/depends/util/include/cmdutils.h
@@ -25,7 +25,7 @@
 #include <QHash>
 #include <QStringList>
 
-#include "libutil_config.h"
+#include "multimc_util_export.h"
 
 /**
  * @file libutil/include/cmdutils.h
@@ -42,7 +42,7 @@ namespace Commandline
  * @param args the argument string
  * @return a QStringList containing all arguments
  */
-LIBUTIL_EXPORT QStringList splitArgs(QString args);
+MULTIMC_UTIL_EXPORT QStringList splitArgs(QString args);
 
 /**
  * @brief The FlagStyle enum
@@ -85,7 +85,7 @@ enum Enum
 /**
  * @brief The ParsingError class
  */
-class LIBUTIL_EXPORT ParsingError : public std::runtime_error
+class MULTIMC_UTIL_EXPORT ParsingError : public std::runtime_error
 {
 public:
 	ParsingError(const QString &what);
@@ -94,7 +94,7 @@ public:
 /**
  * @brief The Parser class
  */
-class LIBUTIL_EXPORT Parser
+class MULTIMC_UTIL_EXPORT Parser
 {
 public:
 	/**
diff --git a/depends/util/include/libutil_config.h b/depends/util/include/libutil_config.h
deleted file mode 100644
index 422001b8..00000000
--- a/depends/util/include/libutil_config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QtCore/QtGlobal>
-
-#ifdef LIBUTIL_STATIC
-#define LIBUTIL_EXPORT
-#else
-#ifdef LIBUTIL_LIBRARY
-#define LIBUTIL_EXPORT Q_DECL_EXPORT
-#else
-#define LIBUTIL_EXPORT Q_DECL_IMPORT
-#endif
-#endif
diff --git a/depends/util/include/modutils.h b/depends/util/include/modutils.h
index bc608f96..fde51881 100644
--- a/depends/util/include/modutils.h
+++ b/depends/util/include/modutils.h
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QList>
 
-#include "libutil_config.h"
+#include "multimc_util_export.h"
 
 class QUrl;
 
@@ -107,7 +107,7 @@ private:
 	void parse();
 };
 
-LIBUTIL_EXPORT bool versionIsInInterval(const QString &version, const QString &interval);
-LIBUTIL_EXPORT bool versionIsInInterval(const Version &version, const QString &interval);
+MULTIMC_UTIL_EXPORT bool versionIsInInterval(const QString &version, const QString &interval);
+MULTIMC_UTIL_EXPORT bool versionIsInInterval(const Version &version, const QString &interval);
 }
 
diff --git a/depends/util/include/pathutils.h b/depends/util/include/pathutils.h
index 82d55cd7..6d52097f 100644
--- a/depends/util/include/pathutils.h
+++ b/depends/util/include/pathutils.h
@@ -18,12 +18,12 @@
 #include <QString>
 #include <QDir>
 
-#include "libutil_config.h"
+#include "multimc_util_export.h"
 
-LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2);
-LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3);
+MULTIMC_UTIL_EXPORT QString PathCombine(QString path1, QString path2);
+MULTIMC_UTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3);
 
-LIBUTIL_EXPORT QString AbsolutePath(QString path);
+MULTIMC_UTIL_EXPORT QString AbsolutePath(QString path);
 
 /**
  * Normalize path
@@ -35,37 +35,37 @@ LIBUTIL_EXPORT QString AbsolutePath(QString path);
  */
 QString NormalizePath(QString path);
 
-LIBUTIL_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-');
+MULTIMC_UTIL_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-');
 
-LIBUTIL_EXPORT QString DirNameFromString(QString string, QString inDir = ".");
+MULTIMC_UTIL_EXPORT QString DirNameFromString(QString string, QString inDir = ".");
 
 /**
  * Creates all the folders in a path for the specified path
  * last segment of the path is treated as a file name and is ignored!
  */
-LIBUTIL_EXPORT bool ensureFilePathExists(QString filenamepath);
+MULTIMC_UTIL_EXPORT bool ensureFilePathExists(QString filenamepath);
 
 /**
  * Creates all the folders in a path for the specified path
  * last segment of the path is treated as a folder name and is created!
  */
-LIBUTIL_EXPORT bool ensureFolderPathExists(QString filenamepath);
+MULTIMC_UTIL_EXPORT bool ensureFolderPathExists(QString filenamepath);
 
 /**
  * Copy a folder recursively
  */
-LIBUTIL_EXPORT bool copyPath(const QString &src, const QString &dst, bool follow_symlinks = true);
+MULTIMC_UTIL_EXPORT bool copyPath(const QString &src, const QString &dst, bool follow_symlinks = true);
 
 /**
  * Delete a folder recursively
  */
-LIBUTIL_EXPORT bool deletePath(QString path);
+MULTIMC_UTIL_EXPORT bool deletePath(QString path);
 
 /// Opens the given file in the default application.
-LIBUTIL_EXPORT void openFileInDefaultProgram(QString filename);
+MULTIMC_UTIL_EXPORT void openFileInDefaultProgram(QString filename);
 
 /// Opens the given directory in the default application.
-LIBUTIL_EXPORT void openDirInDefaultProgram(QString dirpath, bool ensureExists = false);
+MULTIMC_UTIL_EXPORT void openDirInDefaultProgram(QString dirpath, bool ensureExists = false);
 
 /// Checks if the a given Path contains "!"
-LIBUTIL_EXPORT bool checkProblemticPathJava(QDir folder);
+MULTIMC_UTIL_EXPORT bool checkProblemticPathJava(QDir folder);
diff --git a/depends/util/include/userutils.h b/depends/util/include/userutils.h
index 6ce08bce..aadc112e 100644
--- a/depends/util/include/userutils.h
+++ b/depends/util/include/userutils.h
@@ -2,16 +2,16 @@
 
 #include <QString>
 
-#include "libutil_config.h"
+#include "multimc_util_export.h"
 
 namespace Util
 {
 // Get the Directory representing the User's Desktop
-LIBUTIL_EXPORT QString getDesktopDir();
+MULTIMC_UTIL_EXPORT QString getDesktopDir();
 
 // Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
 // call it *name* and assign it the icon *icon*
 // return true if operation succeeded
-LIBUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args,
+MULTIMC_UTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args,
 								   QString name, QString iconLocation);
 }