0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix some small build issues

Browse Source
This commit is contained in:
Petr Mrázek 2021-11-03 15:45:42 +01:00
parent 27f276ef13
commit 7b4c52e1e3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1,5 +1,13 @@
cmake_minimum_required(VERSION 3.1) 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) string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD)
if(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.") 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()
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 options #####################################
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)

2
launcher/pathmatcher/FSTreeMatcher.h
View File

@ -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); return m_fsTree.covers(string);
} }

1
launcher/pathmatcher/IPathMatcher.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <QString>
class IPathMatcher class IPathMatcher
{ {