Updated package, including adding inline namespace with version and FindSkyr.cmake file (#27)

Author: glynos

cmake/FindSkyr.cmake

@@ -1,17 +1,26 @@
-find_path(SKYR_INCLUDE_DIR skyr/url.hpp
-        PATH_SUFFIXES skyr)
+# https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/How-To-Find-Libraries
 
-find_library(SKYR_LIBRARY NAME Skyr::skyr-url)
+find_package(PkgConfig)
+pkg_check_modules(PC_Skyr QUIET skyr-url)
 
+find_path(Skyr_INCLUDE_DIR
+        NAMES skyr/url.hpp
+        HINTS ${Skyr_INCLUDE_DIR_HINT} ${PC_Skyr_INCLUDEDIR} ${PC_Skyr_INCLUDE_DIRS}
+        )
+
+find_library(Skyr_LIBRARY
+        NAME skyr-url
+        HINTS ${Skyr_LIB_DIR_HINT} ${PC_Skyr_LIBDIR} ${PC_Skyr_LIBRARY_DIRS}
+        )
 
 include(FindPackageHandleStandardArgs)
 
-#Handle standard arguments to find_package like REQUIRED and QUIET
 find_package_handle_standard_args(Skyr
         DEFAULT_MSG
-        SKYR_INCLUDE_DIR SKYR_LIBRARY_NAME)
-mark_as_advanced(SKYR_INCLUDE_DIR SKYR_LIBRARY_NAMES)
-
+        Skyr_INCLUDE_DIR Skyr_LIBRARY)
 
-set(SKYR_LIBRARIES ${SKYR_LIBRARY} )
-set(SKYR_INCLUDE_DIRS ${SKYR_INCLUDE_DIR} )
+if (Skyr_FOUND)
+    mark_as_advanced(Skyr_INCLUDE_DIR Skyr_LIBRARY)
+    set(Skyr_LIBRARIES ${Skyr_LIBRARY})
+    set(Skyr_INCLUDE_DIRS ${Skyr_INCLUDE_DIR})
+endif()

include/skyr/traits/string_traits.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) Glyn Matthews 2018.
+// Copyright (c) Glyn Matthews 2018-19.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -11,6 +11,7 @@
 #include <string_view>
 
 namespace skyr {
+inline namespace v1 {
 /// Meta-function to test if the type is of the form
 /// basic_string<charT>
 template <class T, class charT>
@@ -64,6 +65,7 @@ using is_url_convertible =
       is_string_convertible<T, wchar_t>,
       is_string_convertible<T, char16_t>,
       is_string_convertible<T, char32_t>>;
+}  // namespace v1
 }  // namespace skyr
 
 #endif //SKYR_STRING_TRAITS_HPP

include/skyr/unicode/code_point.hpp

@@ -11,7 +11,9 @@
 #include <skyr/unicode/constants.hpp>
 #include <skyr/unicode/core.hpp>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 /// This class defines a range over a code point in raw bytes,
 /// according to UTF-8.
 /// \tparam OctetIterator An iterator type over the raw bytes
@@ -279,6 +281,8 @@ inline tl::expected<u16_code_point_t, std::error_code> u16_value(
     tl::expected<u8_code_point_t<OctetIterator>, std::error_code> code_point) {
   return u32_value(code_point).map([] (auto code_point) { return u16_code_point(code_point); });
 }
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_CODE_POINT_HPP

include/skyr/unicode/constants.hpp

@@ -6,7 +6,9 @@
 #ifndef SKYR_UNICODE_CONSTANTS_HPP
 #define SKYR_UNICODE_CONSTANTS_HPP
 
-namespace skyr::unicode::constants {
+namespace skyr {
+inline namespace v1 {
+namespace unicode::constants {
 namespace surrogates {
 // Leading (high) surrogates: 0xd800 - 0xdbff
 constexpr char16_t lead_min = 0xd800u;
@@ -24,6 +26,8 @@ constexpr char32_t max = 0x0010ffffu;
 }  // namespace code_points
 
 constexpr char bom[] = {'\xef', '\xbb', '\xbf'};
-}  // namespace skyr::unicode::constants
+}  // namespace unicode::constants
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_CONSTANTS_HPP

include/skyr/unicode/core.hpp

@@ -11,7 +11,9 @@
 #include <skyr/unicode/errors.hpp>
 #include <skyr/unicode/constants.hpp>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 ///
 /// \param octet
 /// \return
@@ -301,6 +303,8 @@ tl::expected<sequence_state<OctetIterator>, std::error_code> find_code_point(
       tl::make_unexpected(make_error_code(unicode_errc::overflow))
       ;
 }
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_CORE_HPP

include/skyr/unicode/errors.hpp

@@ -8,7 +8,9 @@
 
 #include <system_error>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 /// Enumerates Unicode errors
 enum class unicode_errc {
   /// Overflow
@@ -25,11 +27,13 @@ enum class unicode_errc {
 /// \param error A Unicode error
 /// \returns A `std::error_code` object
 std::error_code make_error_code(unicode_errc error) noexcept;
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 namespace std {
 template <>
-struct is_error_code_enum<skyr::unicode::unicode_errc> : true_type {};
+struct is_error_code_enum<skyr::v1::unicode::unicode_errc> : true_type {};
 }  // namespace std
 
 #endif //SKYR_UNICODE_ERROR_HPP

include/skyr/unicode/ranges/traits.hpp

@@ -6,7 +6,9 @@
 #ifndef SKYR_UNICODE_RANGE_TRAITS_HPP
 #define SKYR_UNICODE_RANGE_TRAITS_HPP
 
-namespace skyr::unicode::traits {
+namespace skyr {
+inline namespace v1 {
+namespace unicode::traits {
 ///
 /// \tparam Range
 template <class Range>
@@ -23,7 +25,8 @@ class iterator<T[N]> {
  public:
   using type = const T *;
 };
-}  // namespace skyr::unicode::traits
-
+}  // namespace unicode::traits
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_RANGE_TRAITS_HPP

include/skyr/unicode/ranges/transforms/byte_transform.hpp

@@ -14,7 +14,9 @@
 #include <skyr/unicode/ranges/traits.hpp>
 #include <skyr/unicode/ranges/views/u16_view.hpp>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 /// An iterator that converts a code point to bytes when dereferenced
 /// \tparam CodePointIterator
 template<class CodePointIterator>
@@ -259,6 +261,8 @@ tl::expected<Output, std::error_code> as(
   }
   return result;
 }
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_BYTE_RANGE_HPP

include/skyr/unicode/ranges/transforms/u16_transform.hpp

@@ -16,7 +16,9 @@
 #include <skyr/unicode/ranges/views/u8_view.hpp>
 #include <skyr/unicode/ranges/transforms/u32_transform.hpp>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 ///
 /// \tparam CodePointIterator
 template <class CodePointIterator>
@@ -209,6 +211,8 @@ tl::expected<Output, std::error_code> as(transform_u16_range<CodePointRange> &&r
   }
   return result;
 }
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_U16_RANGE_HPP

include/skyr/unicode/ranges/transforms/u32_transform.hpp

@@ -15,7 +15,9 @@
 #include <skyr/unicode/ranges/traits.hpp>
 #include <skyr/unicode/ranges/views/u8_view.hpp>
 
-namespace skyr::unicode {
+namespace skyr {
+inline namespace v1 {
+namespace unicode {
 ///
 /// \tparam CodePointIterator
 template <class CodePointIterator>
@@ -200,6 +202,8 @@ tl::expected<Output, std::error_code> as(transform_u32_range<CodePointRange> &&r
   }
   return result;
 }
-}  // namespace skyr::unicode
+}  // namespace unicode
+}  // namespace v1
+}  // namespace skyr
 
 #endif //SKYR_UNICODE_U32_RANGE_HPP