diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-07 15:44:46 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-11 14:24:01 +0100 |
| commit | f67871e79ea2fcc3cf67c5e4c0f8ce9da909bb63 (patch) | |
| tree | 4b8ca8d321cdc28d8411e6393b256f44db753330 | |
| parent | 11f892380e74d22b22a03c3a0901c2fea815d76f (diff) | |
| download | PrismLauncher-f67871e79ea2fcc3cf67c5e4c0f8ce9da909bb63.tar.gz PrismLauncher-f67871e79ea2fcc3cf67c5e4c0f8ce9da909bb63.tar.bz2 PrismLauncher-f67871e79ea2fcc3cf67c5e4c0f8ce9da909bb63.zip | |
refactor(build): link nbt++ statically
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 4 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..1156fc08 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 |