Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into develop

2013-09-27 08:20:20 +02:00 · 2013-09-27 08:20:20 +02:00 · 6f1278b607
commit 6f1278b607
parent 33b95c6a38 8c36e69b06
2 changed files with 7 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,8 @@
 cmake_minimum_required(VERSION 2.8.9)
+
+# In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
+cmake_policy(SET CMP0020 OLD)
+
 project(MultiMC)

 ######## Set CMake options ########
--- a/depends/pack200/CMakeLists.txt
+++ b/depends/pack200/CMakeLists.txt
@ -1,5 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

+# In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
+cmake_policy(SET CMP0020 OLD)
+
 project(unpack200)

 # Find ZLIB for quazip