diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | launcher/pathmatcher/FSTreeMatcher.h | 2 | ||||
| -rw-r--r-- | launcher/pathmatcher/IPathMatcher.h | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e4aae98b..0cf93758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,13 @@ cmake_minimum_required(VERSION 3.1) +if(WIN32) + # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows + cmake_policy(SET CMP0020 OLD) +endif() + +project(Launcher) +enable_testing() + string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD) if(IS_IN_SOURCE_BUILD) message(FATAL_ERROR "You are building the Launcher in-source. Please separate the build tree from the source tree.") @@ -13,14 +21,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() endif() -if(WIN32) - # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows - cmake_policy(SET CMP0020 OLD) -endif() - -project(Launcher) -enable_testing() - ##################################### Set CMake options ##################################### set(CMAKE_AUTOMOC ON) diff --git a/launcher/pathmatcher/FSTreeMatcher.h b/launcher/pathmatcher/FSTreeMatcher.h index 361924af..b84af294 100644 --- a/launcher/pathmatcher/FSTreeMatcher.h +++ b/launcher/pathmatcher/FSTreeMatcher.h @@ -12,7 +12,7 @@ public: { } - virtual bool matches(const QString &string) const override + bool matches(const QString &string) const override { return m_fsTree.covers(string); } diff --git a/launcher/pathmatcher/IPathMatcher.h b/launcher/pathmatcher/IPathMatcher.h index b60621c9..192782d7 100644 --- a/launcher/pathmatcher/IPathMatcher.h +++ b/launcher/pathmatcher/IPathMatcher.h @@ -1,5 +1,6 @@ #pragma once #include <memory> +#include <QString> class IPathMatcher { |