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

NOISSUE more cmake tweakery

Browse Source
This commit is contained in:
Petr Mrázek 2015-09-28 21:20:27 +02:00
parent 143e24fa04
commit 260a2cea59
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -94,9 +94,9 @@ add_subdirectory(depends/xz-embedded) # xz compression
add_subdirectory(depends/pack200) # java pack200 compression add_subdirectory(depends/pack200) # java pack200 compression
add_subdirectory(depends/rainbow) # Qt extension for colors add_subdirectory(depends/rainbow) # Qt extension for colors
set(NBT_BUILD_SHARED ON CACHE BOOL "Build NBT shared library") option(NBT_BUILD_SHARED "Build NBT shared library" ON)
set(NBT_USE_ZLIB OFF CACHE BOOL "Build NBT library with zlib support") option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF)
set(NBT_BUILD_TESTS OFF CACHE BOOL "Build NBT library tests") #FIXME: fix unit tests. option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests.
add_subdirectory(depends/libnbtplusplus) add_subdirectory(depends/libnbtplusplus)
######## MultiMC Libs ######## ######## MultiMC Libs ########

5
application/CMakeLists.txt
View File

@ -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}) 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) 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 ################################ ################################ INSTALLATION AND PACKAGING ################################
######## Install ######## ######## Install ########