diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-28 21:20:27 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-28 21:20:27 +0200 |
| commit | 260a2cea593b9f2211879a80d1d5d377592678da (patch) | |
| tree | a1f8b254dc13f2fb477a92593938c676fc35ed97 | |
| parent | 143e24fa04f0126d91b65b4035dd6ec556c79b00 (diff) | |
| download | MultiMC-260a2cea593b9f2211879a80d1d5d377592678da.tar MultiMC-260a2cea593b9f2211879a80d1d5d377592678da.tar.gz MultiMC-260a2cea593b9f2211879a80d1d5d377592678da.tar.lz MultiMC-260a2cea593b9f2211879a80d1d5d377592678da.tar.xz MultiMC-260a2cea593b9f2211879a80d1d5d377592678da.zip | |
NOISSUE more cmake tweakery
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | application/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e5314e..c896de08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,9 +94,9 @@ add_subdirectory(depends/xz-embedded) # xz compression add_subdirectory(depends/pack200) # java pack200 compression add_subdirectory(depends/rainbow) # Qt extension for colors -set(NBT_BUILD_SHARED ON CACHE BOOL "Build NBT shared library") -set(NBT_USE_ZLIB OFF CACHE BOOL "Build NBT library with zlib support") -set(NBT_BUILD_TESTS OFF CACHE BOOL "Build NBT library tests") #FIXME: fix unit tests. +option(NBT_BUILD_SHARED "Build NBT shared library" ON) +option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) +option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. add_subdirectory(depends/libnbtplusplus) ######## MultiMC Libs ######## diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index ea5c9c06..90eb3891 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -335,11 +335,6 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS}) add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS}) target_link_libraries(MultiMC MultiMC_logic xz-embedded unpack200 iconfix MultiMC_util ${QUAZIP_LIBRARIES} hoedown rainbow) -if(WIN32) - qt5_use_modules(MultiMC WinMain) -endif(WIN32) - - ################################ INSTALLATION AND PACKAGING ################################ ######## Install ######## |