Merge branch 'develop' of https://github.com/hyperfang8/MultiMC5 into develop
This commit is contained in:
commit
071ac45925
@ -358,7 +358,7 @@ QT5_USE_MODULES(MultiMC Widgets Network Xml)
|
|||||||
TARGET_LINK_LIBRARIES(MultiMC quazip lzma libUtil libSettings libGroupView
|
TARGET_LINK_LIBRARIES(MultiMC quazip lzma libUtil libSettings libGroupView
|
||||||
${MultiMC_LINK_ADDITIONAL_LIBS})
|
${MultiMC_LINK_ADDITIONAL_LIBS})
|
||||||
#ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView)
|
#ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView)
|
||||||
|
ADD_DEPENDENCIES(MultiMC MultiMCLauncher)
|
||||||
|
|
||||||
option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF)
|
option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF)
|
||||||
IF(BUILD_KEYRING_TEST)
|
IF(BUILD_KEYRING_TEST)
|
||||||
|
Loading…
Reference in New Issue
Block a user