From cd55674b36384f70878746ef1c0f8adfbb06c89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 27 Jan 2018 02:42:27 +0100 Subject: NOISSUE do not install .a files for shared libraries on Windows --- libraries/iconfix/CMakeLists.txt | 6 +++++- libraries/libnbtplusplus | 2 +- libraries/pack200/CMakeLists.txt | 6 +++++- libraries/quazip | 2 +- libraries/rainbow/CMakeLists.txt | 6 +++++- 5 files changed, 17 insertions(+), 5 deletions(-) (limited to 'libraries') diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt index 2a9f37f8..93bfdd06 100644 --- a/libraries/iconfix/CMakeLists.txt +++ b/libraries/iconfix/CMakeLists.txt @@ -21,4 +21,8 @@ set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VI generate_export_header(MultiMC_iconfix) # Install it -install(TARGETS MultiMC_iconfix DESTINATION ${LIBRARY_DEST_DIR}) +install( + TARGETS MultiMC_iconfix + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +) \ No newline at end of file diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus index c3ec5b3b..92f8d572 160000 --- a/libraries/libnbtplusplus +++ b/libraries/libnbtplusplus @@ -1 +1 @@ -Subproject commit c3ec5b3bc76f63c0de93d29077e3fc67e6222795 +Subproject commit 92f8d57227feb94643378ecf595626c60c0f59b8 diff --git a/libraries/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt index c9e05fbd..b568e506 100644 --- a/libraries/pack200/CMakeLists.txt +++ b/libraries/pack200/CMakeLists.txt @@ -38,7 +38,11 @@ set_target_properties(MultiMC_unpack200 PROPERTIES CXX_VISIBILITY_PRESET hidden generate_export_header(MultiMC_unpack200) # Install it -install(TARGETS MultiMC_unpack200 DESTINATION ${LIBRARY_DEST_DIR}) +install( + TARGETS MultiMC_unpack200 + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +) if(PACK200_BUILD_BINARY) add_executable(anti200 anti200.cpp) diff --git a/libraries/quazip b/libraries/quazip index 4747be95..683e2ec8 160000 --- a/libraries/quazip +++ b/libraries/quazip @@ -1 +1 @@ -Subproject commit 4747be9520dd55ed226ebe553403bde3bf660cab +Subproject commit 683e2ec8ada758d6e48d31ec606840802e6941b7 diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 826c9938..bc561800 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -15,4 +15,8 @@ target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/i qt5_use_modules(MultiMC_rainbow Core Gui) # Install it -install(TARGETS MultiMC_rainbow DESTINATION ${LIBRARY_DEST_DIR}) +install( + TARGETS MultiMC_rainbow + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +) -- cgit v1.2.3