Added flag to allow enabling/disabling of JSON (which pulls in 3rd party dependency) (#76)

Author: glynos

CMakeLists.txt

@@ -23,14 +23,18 @@ option(skyr_BUILD_WITHOUT_EXCEPTIONS "Build without exceptions." OFF)
 option(skyr_BUILD_WITHOUT_RTTI "Build without RTTI." OFF)
 option(skyr_USE_STATIC_CRT "Use static C Runtime library (/MT or MTd)." ON)
 option(skyr_BUILD_WITH_LLVM_LIBCXX "Instruct Clang to use LLVM's implementation of C++ standard library" OFF)
+option(skyr_ENABLE_JSON_FUNCTIONS "Enable functions to convert URL components to JSON" ON)
 
 set(CMAKE_VERBOSE_MAKEFILE true)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(tl-expected CONFIG REQUIRED)
-find_package(nlohmann_json CONFIG REQUIRED)
+
+if (skyr_ENABLE_JSON_FUNCTIONS)
+    find_package(nlohmann_json CONFIG REQUIRED)
+endif()
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU OR
     ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
@@ -70,8 +74,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES MSVC)
             endif(${flag_var} MATCHES "/MD")
         endforeach(flag_var)
     endif(skyr_USE_STATIC_CRT)
-
-    add_definitions(-D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
 endif()
 
 if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
@@ -105,7 +107,9 @@ endif()
 if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     add_library(skyr::skyr-url ALIAS skyr-url)
     add_library(skyr::skyr-filesystem ALIAS skyr-filesystem)
-    add_library(skyr::skyr-json ALIAS skyr-json)
+    if (skyr_ENABLE_JSON_FUNCTIONS)
+        add_library(skyr::skyr-json ALIAS skyr-json)
+    endif()
 endif()
 
 # Install
@@ -122,7 +126,12 @@ write_basic_package_version_file(
         COMPATIBILITY SameMajorVersion
         ARCH_INDEPENDENT)
 
-install(TARGETS skyr-url skyr-filesystem skyr-json
+set(skyr_TARGETS skyr-url skyr-filesystem)
+if (skyr_ENABLE_JSON_FUNCTIONS)
+    list(APPEND skyr_TARGETS skyr-json)
+endif()
+
+install(TARGETS ${skyr_TARGETS}
         EXPORT ${PROJECT_NAME}-targets
         INCLUDES DESTINATION "${CMAKE_INSTALL_DATADIR}"
         ARCHIVE DESTINATION lib

include/skyr/percent_encoding/percent_encode_range.hpp

@@ -78,7 +78,7 @@ class percent_encode_iterator {
     assert(it_);
     auto byte = *it_.value();
     if (byte == '\x20') {
-      percent_encoded_char('+', percent_encoded_char::no_encode());
+      return percent_encoded_char('+', percent_encoded_char::no_encode());
     } else if ((byte == '\x2a') || (byte == '\x2d') || (byte == '\x2e') ||
                ((byte >= '\x30') && (byte <= '\x39')) ||
                ((byte >= '\x41') && (byte <= '\x5a')) || (byte == '\x5f') ||

src/CMakeLists.txt

@@ -92,6 +92,10 @@ target_include_directories(skyr-url
     PRIVATE
         ${PROJECT_SOURCE_DIR}/src)
 
+if(${CMAKE_CXX_COMPILER_ID} MATCHES MSVC)
+    target_compile_definitions(skyr-url -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
+endif()
+
 #################################################
 # skyr-filesystem
 #################################################
@@ -113,12 +117,14 @@ target_include_directories(skyr-filesystem
 # skyr-json
 #################################################
 
-add_library(skyr-json INTERFACE)
+if (skyr_ENABLE_JSON_FUNCTIONS)
+    add_library(skyr-json INTERFACE)
 
-target_link_libraries(skyr-json INTERFACE tl::expected nlohmann_json::nlohmann_json)
+    target_link_libraries(skyr-json INTERFACE tl::expected nlohmann_json::nlohmann_json)
 
-target_include_directories(skyr-json
-    INTERFACE
-        $<INSTALL_INTERFACE:include>
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-        )
+    target_include_directories(skyr-json
+        INTERFACE
+            $<INSTALL_INTERFACE:include>
+            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+            )
+endif()

tests/CMakeLists.txt

@@ -8,12 +8,6 @@ include(${PROJECT_SOURCE_DIR}/cmake/skyr-url-functions.cmake)
 find_package(Catch2 CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 
-if (MSVC)
-    # For json.hpp
-    add_definitions(-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING)
-endif(MSVC)
-
-
 function(skyr_create_test file_name output_dir test_name)
     skyr_remove_extension(${file_name} test)
     add_executable(${test})
@@ -41,4 +35,6 @@ add_subdirectory(percent_encoding)
 add_subdirectory(network)
 add_subdirectory(url)
 add_subdirectory(filesystem)
-add_subdirectory(json)
+if (skyr_ENABLE_JSON_FUNCTIONS)
+    add_subdirectory(json)
+endif()

tests/json/CMakeLists.txt

@@ -3,7 +3,12 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+if(${CMAKE_CXX_COMPILER_ID} MATCHES MSVC)
+    # For json.hpp
+    add_definitions(-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING)
+endif()
+
 foreach (file_name json_query_tests.cpp)
     skyr_create_test(${file_name} ${PROJECT_BINARY_DIR}/tests/json test_name)
     target_link_libraries(${test_name} PRIVATE skyr-json)
-endforeach ()
+endforeach()