diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-12 17:47:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 17:47:38 +0100 |
| commit | 70a055bc278d4be86b5fca3f03ada312c4577f3d (patch) | |
| tree | cd2890e43a02342cb2ba743ca446d6cc73d502f8 | |
| parent | 2f6973e08b661f3a21724c9dda2977c55d5a3d45 (diff) | |
| parent | 61db1c46beb465c33124ec4f34dfdcefd4d804d3 (diff) | |
| download | PrismLauncher-70a055bc278d4be86b5fca3f03ada312c4577f3d.tar.gz PrismLauncher-70a055bc278d4be86b5fca3f03ada312c4577f3d.tar.bz2 PrismLauncher-70a055bc278d4be86b5fca3f03ada312c4577f3d.zip | |
Merge pull request #143 from Scrumplex/refactor-link-nbtpp-static
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libraries/iconfix/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | libraries/rainbow/CMakeLists.txt | 8 |
4 files changed, 8 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe19d820..74a63614 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,11 +260,9 @@ endif() include(ExternalProject) set_directory_properties(PROPERTIES EP_BASE External) -option(NBT_BUILD_SHARED "Build NBT shared library" ON) +option(NBT_BUILD_SHARED "Build NBT shared library" OFF) option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. -set(NBT_NAME Launcher_nbt++) -set(NBT_DEST_DIR ${LIBRARY_DEST_DIR}) add_subdirectory(libraries/libnbtplusplus) add_subdirectory(libraries/systeminfo) # system information library diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 4fb24b54..3d2d4382 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -941,7 +941,7 @@ add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHE target_link_libraries(Launcher_logic systeminfo Launcher_classparser - ${NBT_NAME} + nbt++ ${ZLIB_LIBRARIES} optional-bare tomlc99 @@ -959,7 +959,7 @@ target_link_libraries(Launcher_logic Launcher_iconfix QuaZip::QuaZip hoedown - Launcher_rainbow + PolyMC_rainbow LocalPeer ) diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt index 52a31c68..049879c4 100644 --- a/libraries/iconfix/CMakeLists.txt +++ b/libraries/iconfix/CMakeLists.txt @@ -12,17 +12,9 @@ internal/qiconloader.cpp internal/qiconloader_p.h ) -add_library(Launcher_iconfix SHARED ${ICONFIX_SOURCES}) +add_library(Launcher_iconfix ${ICONFIX_SOURCES}) target_include_directories(Launcher_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" ) target_link_libraries(Launcher_iconfix Qt5::Core Qt5::Widgets) -set_target_properties(Launcher_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) generate_export_header(Launcher_iconfix) - -# Install it -install( - TARGETS Launcher_iconfix - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -)
\ No newline at end of file diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 833538e3..a07135c3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -9,14 +9,14 @@ src/rainbow.cpp ) add_definitions(-DRAINBOW_LIBRARY) -add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(PolyMC_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(PolyMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) +target_link_libraries(PolyMC_rainbow Qt5::Core Qt5::Gui) # Install it install( - TARGETS Launcher_rainbow + TARGETS PolyMC_rainbow RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} ) |