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
This commit is contained in:
@ -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})
|
||||
|
@ -11,3 +11,4 @@ set(SRC
|
||||
)
|
||||
|
||||
add_jar(JavaCheck ${SRC})
|
||||
install_jar(JavaCheck "${JARS_DEST_DIR}")
|
||||
|
@ -18,4 +18,4 @@ set(SRC
|
||||
net/minecraft/Launcher.java
|
||||
)
|
||||
add_jar(NewLaunch ${SRC})
|
||||
|
||||
install_jar(NewLaunch "${JARS_DEST_DIR}")
|
||||
|
Submodule libraries/libnbtplusplus updated: 4b305bbd2a...c3ec5b3bc7
@ -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)
|
||||
|
Submodule libraries/quazip updated: 164acc35fd...4747be9520
@ -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})
|
||||
|
Reference in New Issue
Block a user