diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-01-27 02:42:27 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-01-27 02:42:27 +0100 |
| commit | cd55674b36384f70878746ef1c0f8adfbb06c89f (patch) | |
| tree | 0801b5949e5b0fa55ee34b5757403c0336d9a472 | |
| parent | 166e5a03d63e0b522876bfc072f26f213d5a3a62 (diff) | |
| download | MultiMC-cd55674b36384f70878746ef1c0f8adfbb06c89f.tar MultiMC-cd55674b36384f70878746ef1c0f8adfbb06c89f.tar.gz MultiMC-cd55674b36384f70878746ef1c0f8adfbb06c89f.tar.lz MultiMC-cd55674b36384f70878746ef1c0f8adfbb06c89f.tar.xz MultiMC-cd55674b36384f70878746ef1c0f8adfbb06c89f.zip | |
NOISSUE do not install .a files for shared libraries on Windows
| -rw-r--r-- | api/gui/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | api/logic/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libraries/iconfix/CMakeLists.txt | 6 | ||||
| m--------- | libraries/libnbtplusplus | 0 | ||||
| -rw-r--r-- | libraries/pack200/CMakeLists.txt | 6 | ||||
| m--------- | libraries/quazip | 0 | ||||
| -rw-r--r-- | libraries/rainbow/CMakeLists.txt | 6 |
7 files changed, 25 insertions, 5 deletions
diff --git a/api/gui/CMakeLists.txt b/api/gui/CMakeLists.txt index 0e8cc683..deae735f 100644 --- a/api/gui/CMakeLists.txt +++ b/api/gui/CMakeLists.txt @@ -28,4 +28,8 @@ qt5_use_modules(MultiMC_gui Gui) target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") # Install it -install(TARGETS MultiMC_gui DESTINATION ${LIBRARY_DEST_DIR}) +install( + TARGETS MultiMC_gui + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +)
\ No newline at end of file diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index b835ee97..3d5687b0 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -461,4 +461,8 @@ qt5_use_modules(MultiMC_logic Core Xml Network Concurrent) target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}") # Install it -install(TARGETS MultiMC_logic DESTINATION ${LIBRARY_DEST_DIR}) +install( + TARGETS MultiMC_logic + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +) 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 -Subproject c3ec5b3bc76f63c0de93d29077e3fc67e622279 +Subproject 92f8d57227feb94643378ecf595626c60c0f59b 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 -Subproject 4747be9520dd55ed226ebe553403bde3bf660ca +Subproject 683e2ec8ada758d6e48d31ec606840802e6941b 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} +) |