diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
| commit | 47bf7fff27665496bc4212bcaccc80350f665f97 (patch) | |
| tree | 878fd220464c5280fcbe589d3ed738ce0306ab2a /CMakeLists.txt | |
| parent | ae68adc3a536525990b0668703fd74eded8ccfde (diff) | |
| parent | dff00a6d2abb84a93e48ff00dda16444550d859f (diff) | |
| download | PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.tar.gz PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.tar.bz2 PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.zip | |
Merge remote-tracking branch 'upstream/develop' into updater_tests
Conflicts:
mmc_updater/src/tests/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ea5803d..33f74a8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,8 +300,6 @@ logic/net/NetJob.h logic/net/NetJob.cpp logic/net/HttpMetaCache.h logic/net/HttpMetaCache.cpp -logic/net/S3ListBucket.h -logic/net/S3ListBucket.cpp logic/net/PasteUpload.h logic/net/PasteUpload.cpp logic/net/URLConstants.h @@ -482,10 +480,10 @@ QT5_ADD_RESOURCES(GENERATED_QRC ${CMAKE_CURRENT_BINARY_DIR}/generated.qrc) QT5_ADD_RESOURCES(GRAPHICS_QRC graphics.qrc) # Add common library -ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GENERATED_QRC} ${GRAPHICS_QRC} ${MULTIMC_RCS}) +ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GENERATED_QRC} ${GRAPHICS_QRC}) # Add executable -ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp) +ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) # Link TARGET_LINK_LIBRARIES(MultiMC MultiMC_common) |