diff options
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | include/io/stream_writer.h | 1 | ||||
| -rw-r--r-- | include/tag_array.h | 5 | ||||
| -rw-r--r-- | include/tag_list.h | 2 | ||||
| -rw-r--r-- | src/tag_array.cpp | 5 |
5 files changed, 17 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1faa5dc034..adbd3443d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.9.4) project(libnbt++ VERSION 2.3) @@ -8,9 +8,9 @@ option(NBT_USE_ZLIB "Build additional zlib stream functionality" ON) option(NBT_BUILD_TESTS "Build the unit tests. Requires CxxTest." ON) if(NBT_NAME) - message("Using override nbt++ name: ${NBT_NAME}") + message("Using override nbt++ name: ${NBT_NAME}") else() - set(NBT_NAME nbt++) + set(NBT_NAME nbt++) endif() # hide this from includers. @@ -48,16 +48,16 @@ target_include_directories(${NBT_NAME} PUBLIC include ${CMAKE_CURRENT_BINARY_DIR # Install it if(DEFINED NBT_DEST_DIR) - install( - TARGETS ${NBT_NAME} - ARCHIVE DESTINATION ${LIBRARY_DEST_DIR} - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} - ) + install( + TARGETS ${NBT_NAME} + ARCHIVE DESTINATION ${LIBRARY_DEST_DIR} + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} + ) endif() if(NBT_USE_ZLIB) - target_link_libraries(${NBT_NAME} z) + target_link_libraries(${NBT_NAME} ZLIB::ZLIB) endif() set_property(TARGET ${NBT_NAME} PROPERTY CXX_STANDARD 11) generate_export_header(${NBT_NAME} BASE_NAME nbt) diff --git a/include/io/stream_writer.h b/include/io/stream_writer.h index b10f03adfa..a69508f392 100644 --- a/include/io/stream_writer.h +++ b/include/io/stream_writer.h @@ -23,6 +23,7 @@ #include "tag.h" #include "endian_str.h" #include <iosfwd> +#include <string> namespace nbt { diff --git a/include/tag_array.h b/include/tag_array.h index 6e6a92bbeb..bed84d8070 100644 --- a/include/tag_array.h +++ b/include/tag_array.h @@ -126,11 +126,6 @@ typedef tag_array<int8_t> tag_byte_array; typedef tag_array<int32_t> tag_int_array; typedef tag_array<int64_t> tag_long_array; -//Explicit instantiations -template class NBT_EXPORT tag_array<int8_t>; -template class NBT_EXPORT tag_array<int32_t>; -template class NBT_EXPORT tag_array<int64_t>; - } #endif // TAG_ARRAY_H_INCLUDED diff --git a/include/tag_list.h b/include/tag_list.h index ecd7e89c11..e2c9b7bb7c 100644 --- a/include/tag_list.h +++ b/include/tag_list.h @@ -215,7 +215,7 @@ void tag_list::init(std::initializer_list<Arg> init) el_type_ = T::type; tags.reserve(init.size()); for(const Arg& arg: init) - tags.emplace_back(make_unique<T>(arg)); + tags.emplace_back(nbt::make_unique<T>(arg)); } } diff --git a/src/tag_array.cpp b/src/tag_array.cpp index 4a1668ad1e..a48f52a9c2 100644 --- a/src/tag_array.cpp +++ b/src/tag_array.cpp @@ -126,4 +126,9 @@ void tag_array<int64_t>::write_payload(io::stream_writer& writer) const writer.write_num(i); } +//Explicit instantiations +template class NBT_EXPORT tag_array<int8_t>; +template class NBT_EXPORT tag_array<int32_t>; +template class NBT_EXPORT tag_array<int64_t>; + } |