diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-01-22 04:28:07 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-01-27 02:00:20 +0100 |
| commit | 166e5a03d63e0b522876bfc072f26f213d5a3a62 (patch) | |
| tree | 73b9ec9ab09e4a3fcf5c2c0b0ce6568b0b3e0b9b /api | |
| parent | 0c2e2094ee96ebe8764dd977bd0b5eb254579dcc (diff) | |
| download | MultiMC-166e5a03d63e0b522876bfc072f26f213d5a3a62.tar MultiMC-166e5a03d63e0b522876bfc072f26f213d5a3a62.tar.gz MultiMC-166e5a03d63e0b522876bfc072f26f213d5a3a62.tar.lz MultiMC-166e5a03d63e0b522876bfc072f26f213d5a3a62.tar.xz MultiMC-166e5a03d63e0b522876bfc072f26f213d5a3a62.zip | |
NOISSUE rearrange build system
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
Diffstat (limited to 'api')
| -rw-r--r-- | api/gui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | api/logic/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/gui/CMakeLists.txt b/api/gui/CMakeLists.txt index 911a0ab8..0e8cc683 100644 --- a/api/gui/CMakeLists.txt +++ b/api/gui/CMakeLists.txt @@ -26,3 +26,6 @@ qt5_use_modules(MultiMC_gui Gui) # Mark and export headers target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") + +# Install it +install(TARGETS MultiMC_gui DESTINATION ${LIBRARY_DEST_DIR}) diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 8a8ef495..b835ee97 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -459,3 +459,6 @@ qt5_use_modules(MultiMC_logic Core Xml Network Concurrent) # Mark and export headers 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}) |