From 166e5a03d63e0b522876bfc072f26f213d5a3a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 22 Jan 2018 04:28:07 +0100
Subject: 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
---
 libraries/iconfix/CMakeLists.txt   | 3 +++
 libraries/javacheck/CMakeLists.txt | 1 +
 libraries/launcher/CMakeLists.txt  | 2 +-
 libraries/libnbtplusplus           | 2 +-
 libraries/pack200/CMakeLists.txt   | 3 +++
 libraries/quazip                   | 2 +-
 libraries/rainbow/CMakeLists.txt   | 3 +++
 7 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'libraries')

diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt
index 6a99effe..2a9f37f8 100644
--- a/libraries/iconfix/CMakeLists.txt
+++ b/libraries/iconfix/CMakeLists.txt
@@ -19,3 +19,6 @@ qt5_use_modules(MultiMC_iconfix Core Widgets)
 
 set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
 generate_export_header(MultiMC_iconfix)
+
+# Install it
+install(TARGETS MultiMC_iconfix DESTINATION ${LIBRARY_DEST_DIR})
diff --git a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
index 9768650e..381efe08 100644
--- a/libraries/javacheck/CMakeLists.txt
+++ b/libraries/javacheck/CMakeLists.txt
@@ -11,3 +11,4 @@ set(SRC
 )
 
 add_jar(JavaCheck ${SRC})
+install_jar(JavaCheck "${JARS_DEST_DIR}")
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index e468904c..a4f52edb 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -18,4 +18,4 @@ set(SRC
 	net/minecraft/Launcher.java
 )
 add_jar(NewLaunch ${SRC})
-
+install_jar(NewLaunch "${JARS_DEST_DIR}")
diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus
index 4b305bbd..c3ec5b3b 160000
--- a/libraries/libnbtplusplus
+++ b/libraries/libnbtplusplus
@@ -1 +1 @@
-Subproject commit 4b305bbd2ac0e7a26987baf7949a484a87b474d4
+Subproject commit c3ec5b3bc76f63c0de93d29077e3fc67e6222795
diff --git a/libraries/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt
index 359445d2..c9e05fbd 100644
--- a/libraries/pack200/CMakeLists.txt
+++ b/libraries/pack200/CMakeLists.txt
@@ -37,6 +37,9 @@ target_link_libraries(MultiMC_unpack200 ${ZLIB_LIBRARIES})
 set_target_properties(MultiMC_unpack200 PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
 generate_export_header(MultiMC_unpack200)
 
+# Install it
+install(TARGETS MultiMC_unpack200 DESTINATION ${LIBRARY_DEST_DIR})
+
 if(PACK200_BUILD_BINARY)
 	add_executable(anti200 anti200.cpp)
 	target_link_libraries(anti200 MultiMC_unpack200)
diff --git a/libraries/quazip b/libraries/quazip
index 164acc35..4747be95 160000
--- a/libraries/quazip
+++ b/libraries/quazip
@@ -1 +1 @@
-Subproject commit 164acc35fd5f77d353161dcf1c4e121bc2ce756f
+Subproject commit 4747be9520dd55ed226ebe553403bde3bf660cab
diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt
index 15019a71..826c9938 100644
--- a/libraries/rainbow/CMakeLists.txt
+++ b/libraries/rainbow/CMakeLists.txt
@@ -13,3 +13,6 @@ add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES})
 target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 qt5_use_modules(MultiMC_rainbow Core Gui)
+
+# Install it
+install(TARGETS MultiMC_rainbow DESTINATION ${LIBRARY_DEST_DIR})
-- 
cgit v1.2.3