diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-06 02:22:18 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-06 02:22:18 +0200 |
| commit | 9cef16a47d8e6085baec08c4b2823631ef8f1b30 (patch) | |
| tree | 319d22c472b8d502deecd96bc587ce1e07545262 /CMakeLists.txt | |
| parent | f83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff) | |
| parent | b5816f976eca1b2220fff284c5dbceeb5e211bde (diff) | |
| download | MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.gz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.lz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.tar.xz MultiMC-9cef16a47d8e6085baec08c4b2823631ef8f1b30.zip | |
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ecfb690..a02a4b27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ 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) +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(MultiMC) @@ -308,6 +310,9 @@ logic/tasks/ProgressProvider.h logic/tasks/Task.h logic/tasks/Task.cpp +# Utilities +logic/JavaUtils.h +logic/JavaUtils.cpp ) |