ljfa-ag · madmongo1 · Apr 14, 2020 · Apr 14, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.16)
 project(libnbt++
     VERSION 2.5)
 
@@ -37,7 +37,12 @@ if(NBT_USE_ZLIB)
 endif()
 
 add_library(nbt++ ${NBT_SOURCES})
-target_include_directories(nbt++ PUBLIC include ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(nbt++ PRIVATE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/libnbt++>")
+
+target_include_directories(nbt++ PUBLIC
+        "$<INSTALL_INTERFACE:include>")
 
 if(NBT_USE_ZLIB)
     target_link_libraries(nbt++ ${ZLIB_LIBRARY})
@@ -57,3 +62,57 @@ if(NBT_BUILD_TESTS)
     enable_testing()
     add_subdirectory(test)
 endif()
+
+
+#
+# installation
+#
+
+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+
+set(config_install_dir "lib/cmake/${PROJECT_NAME}")
+set(include_install_dir "include")
+set(lib_install_dir "lib")
+set(pkgconfig_install_dir "lib/pkgconfig")
+
+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
+set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
+set(targets_export_name "${PROJECT_NAME}Targets")
+set(namespace "libnbt++::")
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+        "${version_config}" COMPATIBILITY SameMajorVersion
+)
+
+configure_file("cmake/libnbt++.pc.in" "${pkg_config}" @ONLY)
+
+configure_package_config_file(
+        "cmake/Config.cmake.in"
+        "${project_config}"
+        INSTALL_DESTINATION "${config_install_dir}"
+)
+
+install(TARGETS nbt++
+        EXPORT "${targets_export_name}"
+        INCLUDES DESTINATION "${include_install_dir}"
+        ARCHIVE DESTINATION "${lib_install_dir}")
+
+install(DIRECTORY include/libnbt++ DESTINATION "${include_install_dir}")
+
+install(
+        FILES "${project_config}" "${version_config}"
+        DESTINATION "${config_install_dir}"
+)
+
+install(
+        FILES "${pkg_config}"
+        DESTINATION "${pkgconfig_install_dir}"
+)
+
+install(
+        EXPORT "${targets_export_name}"
+        NAMESPACE "${namespace}"
+        DESTINATION "${config_install_dir}"
+)
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
diff --git a/cmake/libnbt++.pc.in b/cmake/libnbt++.pc.in
@@ -0,0 +1,6 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+
+Name: @PROJECT_NAME@
+Description: libnbt++ by lijfa-ag
+Version: @PROJECT_VERSION@
diff --git a/include/crtp_tag.h → include/libnbt++/crtp_tag.h b/include/crtp_tag.h → include/libnbt++/crtp_tag.h
diff --git a/include/endian_str.h → include/libnbt++/endian_str.h b/include/endian_str.h → include/libnbt++/endian_str.h
diff --git a/include/io/izlibstream.h → include/libnbt++/io/izlibstream.h b/include/io/izlibstream.h → include/libnbt++/io/izlibstream.h
@@ -20,7 +20,7 @@
 #ifndef IZLIBSTREAM_H_INCLUDED
 #define IZLIBSTREAM_H_INCLUDED
 
-#include "io/zlib_streambuf.h"
+#include <libnbt++/io/zlib_streambuf.h>
 #include <istream>
 #include <zlib.h>
 

diff --git a/include/io/ozlibstream.h → include/libnbt++/io/ozlibstream.h b/include/io/ozlibstream.h → include/libnbt++/io/ozlibstream.h
@@ -20,7 +20,7 @@
 #ifndef OZLIBSTREAM_H_INCLUDED
 #define OZLIBSTREAM_H_INCLUDED
 
-#include "io/zlib_streambuf.h"
+#include <libnbt++/io/zlib_streambuf.h>
 #include <ostream>
 #include <zlib.h>
 

diff --git a/include/io/stream_reader.h → include/libnbt++/io/stream_reader.h b/include/io/stream_reader.h → include/libnbt++/io/stream_reader.h
@@ -20,9 +20,9 @@
 #ifndef STREAM_READER_H_INCLUDED
 #define STREAM_READER_H_INCLUDED
 
-#include "endian_str.h"
-#include "tag.h"
-#include "tag_compound.h"
+#include <libnbt++/endian_str.h>
+#include <libnbt++/tag.h>
+#include <libnbt++/tag_compound.h>
 #include <iosfwd>
 #include <memory>
 #include <stdexcept>

diff --git a/include/io/stream_writer.h → include/libnbt++/io/stream_writer.h b/include/io/stream_writer.h → include/libnbt++/io/stream_writer.h
@@ -20,8 +20,8 @@
 #ifndef STREAM_WRITER_H_INCLUDED
 #define STREAM_WRITER_H_INCLUDED
 
-#include "tag.h"
-#include "endian_str.h"
+#include <libnbt++/tag.h>
+#include <libnbt++/endian_str.h>
 #include <iosfwd>
 #include <string>
 

diff --git a/include/io/zlib_streambuf.h → include/libnbt++/io/zlib_streambuf.h b/include/io/zlib_streambuf.h → include/libnbt++/io/zlib_streambuf.h
@@ -5,7 +5,7 @@
 #include <streambuf>
 #include <vector>
 #include <zlib.h>
-#include "nbt_export.h"
+#include <libnbt++/nbt_export.h>
 
 namespace zlib
 {

diff --git a/include/make_unique.h → include/libnbt++/make_unique.h b/include/make_unique.h → include/libnbt++/make_unique.h
diff --git a/include/libnbt++/nbt_export.h b/include/libnbt++/nbt_export.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#ifndef NBT_EXPORT
+
+#define NBT_EXPORT __attribute__((visibility("default")))
+#endif
diff --git a/include/nbt_tags.h → include/libnbt++/nbt_tags.h b/include/nbt_tags.h → include/libnbt++/nbt_tags.h
diff --git a/include/nbt_visitor.h → include/libnbt++/nbt_visitor.h b/include/nbt_visitor.h → include/libnbt++/nbt_visitor.h
diff --git a/include/primitive_detail.h → include/libnbt++/primitive_detail.h b/include/primitive_detail.h → include/libnbt++/primitive_detail.h
diff --git a/include/tag.h → include/libnbt++/tag.h b/include/tag.h → include/libnbt++/tag.h
diff --git a/include/tag_array.h → include/libnbt++/tag_array.h b/include/tag_array.h → include/libnbt++/tag_array.h
diff --git a/include/tag_compound.h → include/libnbt++/tag_compound.h b/include/tag_compound.h → include/libnbt++/tag_compound.h
diff --git a/include/tag_list.h → include/libnbt++/tag_list.h b/include/tag_list.h → include/libnbt++/tag_list.h
diff --git a/include/tag_primitive.h → include/libnbt++/tag_primitive.h b/include/tag_primitive.h → include/libnbt++/tag_primitive.h
diff --git a/include/tag_string.h → include/libnbt++/tag_string.h b/include/tag_string.h → include/libnbt++/tag_string.h
diff --git a/include/tagfwd.h → include/libnbt++/tagfwd.h b/include/tagfwd.h → include/libnbt++/tagfwd.h
diff --git a/include/text/json_formatter.h → include/libnbt++/text/json_formatter.h b/include/text/json_formatter.h → include/libnbt++/text/json_formatter.h
diff --git a/include/value.h → include/libnbt++/value.h b/include/value.h → include/libnbt++/value.h
diff --git a/include/value_initializer.h → include/libnbt++/value_initializer.h b/include/value_initializer.h → include/libnbt++/value_initializer.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")