diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-27 08:20:20 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-27 08:20:20 +0200 |
| commit | 6f1278b607a12f80c1cdcdaf343f618a9b10ba95 (patch) | |
| tree | cf7d449b953eb38c029566c8516018e055df5dbb | |
| parent | 33b95c6a38080b9cecfffddaf41964d12fefd2b3 (diff) | |
| parent | 8c36e69b06004a446d69fd3c529172030a449651 (diff) | |
| download | MultiMC-6f1278b607a12f80c1cdcdaf343f618a9b10ba95.tar MultiMC-6f1278b607a12f80c1cdcdaf343f618a9b10ba95.tar.gz MultiMC-6f1278b607a12f80c1cdcdaf343f618a9b10ba95.tar.lz MultiMC-6f1278b607a12f80c1cdcdaf343f618a9b10ba95.tar.xz MultiMC-6f1278b607a12f80c1cdcdaf343f618a9b10ba95.zip | |
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into develop
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | depends/pack200/CMakeLists.txt | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f16a5620..ffa04b88 100644 --- 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 ######## diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 1befa352..79c78f80 100644 --- 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 |