summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-23 01:21:19 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-23 01:21:19 +0200
commit5d5bee49928e36d552c8df62bb820af82bd24032 (patch)
treeb369d566368f1622ae2fd3a2b2c0021a4aa7b5b1 /CMakeLists.txt
parente60a652b78af8f985862da726898291f807ae058 (diff)
downloadMultiMC-5d5bee49928e36d552c8df62bb820af82bd24032.tar
MultiMC-5d5bee49928e36d552c8df62bb820af82bd24032.tar.gz
MultiMC-5d5bee49928e36d552c8df62bb820af82bd24032.tar.lz
MultiMC-5d5bee49928e36d552c8df62bb820af82bd24032.tar.xz
MultiMC-5d5bee49928e36d552c8df62bb820af82bd24032.zip
GH-1238 re-integrate nbt library
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2655379b..2bf0b8cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ include(Coverage)
include(GenerateExportHeader)
set(CMAKE_CXX_FLAGS " -Wall ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
# cmake code needed for the coverity scan upload
include(Coverity)
@@ -118,10 +117,11 @@ include_directories(${PACK200_INCLUDE_DIR})
add_subdirectory(depends/rainbow)
include_directories(${RAINBOW_INCLUDE_DIR})
-# Add color thingy
+# Add NBT library - with out preferred options
+set(NBT_BUILD_SHARED ON)
+set(NBT_USE_ZLIB OFF)
+set(NBT_BUILD_TESTS OFF) #FIXME: fix unit tests.
add_subdirectory(depends/libnbtplusplus)
-include_directories(${LIBNBTPP_INCLUDE_DIR})
-include_directories(${LIBNBTPP_BIN_INCLUDE_DIR})
######## MultiMC Libs ########