Cmake updates

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) Glyn Matthews 2012-2020.
+# Copyright (c) Glyn Matthews 2012-2021.
 # 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)
@@ -14,6 +14,12 @@ project(
         LANGUAGES CXX
 )
 
+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+    set(skyr_IS_TOP_LEVEL_PROJECT YES)
+else()
+    set(skyr_IS_TOP_LEVEL_PROJECT NO)
+endif()
+
 option(skyr_BUILD_TESTS "Build the URL tests." ON)
 option(skyr_BUILD_DOCS "Build the URL documentation." OFF)
 option(skyr_BUILD_EXAMPLES "Build the URL examples." OFF)
@@ -25,16 +31,18 @@ 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_FILESYSTEM_FUNCTIONS "Enable functions to convert URL to std::filesystem::path" ON)
 option(skyr_ENABLE_JSON_FUNCTIONS "Enable functions to convert URL components to JSON" ON)
+option(skyr_BUILD_V1 "Build v1" ON)
 option(skyr_BUILD_V2 "Build v2, which uses C++20 features" OFF)
 
-set(CMAKE_VERBOSE_MAKEFILE true)
-if (skyr_BUILD_V2)
-    set(CMAKE_CXX_STANDARD 20)
-else()
+if (skyr_IS_TOP_LEVEL_PROJECT)
+    set(CMAKE_VERBOSE_MAKEFILE true)
     set(CMAKE_CXX_STANDARD 17)
+    if (skyr_BUILD_V2)
+        set(CMAKE_CXX_STANDARD 20)
+    endif()
+    set(CMAKE_CXX_EXTENSIONS OFF)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(tl-expected CONFIG REQUIRED)
 find_package(range-v3 CONFIG REQUIRED)
@@ -48,6 +56,16 @@ if (skyr_USE_STATIC_CRT AND ${CMAKE_CXX_COMPILER_ID} MATCHES MSVC)
     skyr_replace_dynamic_msvcrt_linker_flags()
 endif()
 
+set(full_warnings $<BOOL:${skyr_FULL_WARNINGS}>)
+set(warnings_as_errors $<BOOL:${skyr_WARNINGS_AS_ERRORS}>)
+set(no_exceptions $<BOOL:${skyr_BUILD_WITHOUT_EXCEPTIONS}>)
+set(no_rtti $<BOOL:${skyr_BUILD_WITHOUT_RTTI}>)
+
+set(gnu $<CXX_COMPILER_ID:GNU>)
+set(clang $<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>)
+set(libcxx $<AND:${clang},$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>)
+set(clang_with_gnu_stdlib $<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<BOOL:${WIN32}>>,$<NOT:$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>>)
+set(msvc $<CXX_COMPILER_ID:MSVC>)
 
 add_subdirectory(src)
 
@@ -70,102 +88,107 @@ if (skyr_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
-# Add an alias for projects that use skyr-url as a dependency
-if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-    add_library(skyr::skyr-url ALIAS skyr-url-v1)
-    if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
-        add_library(skyr::skyr-filesystem ALIAS skyr-filesystem-v1)
+if (skyr_BUILD_V1)
+    # Add an alias for projects that use skyr-url as a dependency
+    if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+        add_library(skyr::skyr-url ALIAS skyr-url-v1)
+        add_library(skyr::url ALIAS skyr-url-v1)
+        if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
+            add_library(skyr::skyr-filesystem ALIAS skyr-filesystem-v1)
+            add_library(skyr::filesystem ALIAS skyr-filesystem-v1)
+        endif()
+        if (skyr_ENABLE_JSON_FUNCTIONS)
+            add_library(skyr::skyr-json ALIAS skyr-json-v1)
+            add_library(skyr::json ALIAS skyr-json-v1)
+        endif()
     endif()
-    if (skyr_ENABLE_JSON_FUNCTIONS)
-        add_library(skyr::skyr-json ALIAS skyr-json-v1)
-    endif()
-endif()
-
-## Install
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
-
-configure_package_config_file(
-        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
-        "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-        INSTALL_DESTINATION "share/cmake/${PROJECT_NAME}")
 
-write_basic_package_version_file(
-        "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
-        COMPATIBILITY SameMajorVersion
-        ARCH_INDEPENDENT)
-
-set(skyr_TARGETS skyr-url-v1)
-if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
-    list(APPEND skyr_TARGETS skyr-filesystem-v1)
-endif()
-if (skyr_ENABLE_JSON_FUNCTIONS)
-    list(APPEND skyr_TARGETS skyr-json-v1)
-endif()
+    ## Install
+    include(CMakePackageConfigHelpers)
+    include(GNUInstallDirs)
 
-install(TARGETS ${skyr_TARGETS}
-        EXPORT ${PROJECT_NAME}-targets
-        INCLUDES DESTINATION "${CMAKE_INSTALL_DATADIR}"
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib)
-
-install(EXPORT ${PROJECT_NAME}-targets
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}"
-        NAMESPACE skyr::
-        FILE "${PROJECT_NAME}-targets.cmake")
-
-install(FILES
-        "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
-        "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}")
-
-install(
-        DIRECTORY
-        "${PROJECT_SOURCE_DIR}/include/skyr/core"
-        "${PROJECT_SOURCE_DIR}/include/skyr/domain"
-        "${PROJECT_SOURCE_DIR}/include/skyr/network"
-        "${PROJECT_SOURCE_DIR}/include/skyr/percent_encoding"
-        DESTINATION
-        include/skyr
-)
+    configure_package_config_file(
+            "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
+            "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+            INSTALL_DESTINATION "share/cmake/${PROJECT_NAME}")
 
-install(
-        DIRECTORY
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/core"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/domain"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/network"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/percent_encoding"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/platform"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/string"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/traits"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/unicode"
-        DESTINATION
-        include/skyr/v1
-)
+    write_basic_package_version_file(
+            "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
+            COMPATIBILITY SameMajorVersion
+            ARCH_INDEPENDENT)
 
-install(
-        FILES
-        "${PROJECT_BINARY_DIR}/include/skyr/version.hpp"
-        "${PROJECT_SOURCE_DIR}/include/skyr/config.hpp"
-        "${PROJECT_SOURCE_DIR}/include/skyr/url.hpp"
-        DESTINATION
-        include/skyr
-)
+    set(skyr_TARGETS skyr-url-v1)
+    if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
+        list(APPEND skyr_TARGETS skyr-filesystem-v1)
+    endif()
+    if (skyr_ENABLE_JSON_FUNCTIONS)
+        list(APPEND skyr_TARGETS skyr-json-v1)
+    endif()
 
-install(
-        FILES
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/url.hpp"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/url_search_parameters.hpp"
-        DESTINATION
-        include/skyr/v1
-)
+    install(TARGETS ${skyr_TARGETS}
+            EXPORT ${PROJECT_NAME}-targets
+            INCLUDES DESTINATION "${CMAKE_INSTALL_DATADIR}"
+            ARCHIVE DESTINATION lib
+            LIBRARY DESTINATION lib)
+
+    install(EXPORT ${PROJECT_NAME}-targets
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}"
+            NAMESPACE skyr::
+            FILE "${PROJECT_NAME}-targets.cmake")
+
+    install(FILES
+            "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
+            "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}")
+
+    install(
+            DIRECTORY
+            "${PROJECT_SOURCE_DIR}/include/skyr/core"
+            "${PROJECT_SOURCE_DIR}/include/skyr/domain"
+            "${PROJECT_SOURCE_DIR}/include/skyr/network"
+            "${PROJECT_SOURCE_DIR}/include/skyr/percent_encoding"
+            DESTINATION
+            include/skyr
+    )
+
+    install(
+            DIRECTORY
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/core"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/domain"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/network"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/percent_encoding"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/platform"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/string"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/traits"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/unicode"
+            DESTINATION
+            include/skyr/v1
+    )
+
+    install(
+            FILES
+            "${PROJECT_BINARY_DIR}/include/skyr/version.hpp"
+            "${PROJECT_SOURCE_DIR}/include/skyr/config.hpp"
+            "${PROJECT_SOURCE_DIR}/include/skyr/url.hpp"
+            DESTINATION
+            include/skyr
+    )
+
+    install(
+            FILES
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/url.hpp"
+            "${PROJECT_SOURCE_DIR}/include/skyr/v1/url_search_parameters.hpp"
+            DESTINATION
+            include/skyr/v1
+    )
 
-if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
-    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/filesystem" DESTINATION include/skyr)
-    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/v1/filesystem" DESTINATION include/skyr/v1)
-endif()
+    if (skyr_ENABLE_FILESYSTEM_FUNCTIONS)
+        install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/filesystem" DESTINATION include/skyr)
+        install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/v1/filesystem" DESTINATION include/skyr/v1)
+    endif()
 
-if (skyr_ENABLE_JSON_FUNCTIONS)
-    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/json" DESTINATION include/skyr)
-    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/v1/json" DESTINATION include/skyr/v1)
+    if (skyr_ENABLE_JSON_FUNCTIONS)
+        install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/json" DESTINATION include/skyr)
+        install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/skyr/v1/json" DESTINATION include/skyr/v1)
+    endif()
 endif()

examples/CMakeLists.txt

@@ -1 +1,3 @@
-add_subdirectory(v1)
+if (skyr_BUILD_V1)
+    add_subdirectory(v1)
+endif()

examples/v1/CMakeLists.txt

@@ -5,16 +5,6 @@
 
 include(${PROJECT_SOURCE_DIR}/cmake/skyr-url-functions.cmake)
 
-set(full_warnings $<BOOL:${skyr_FULL_WARNINGS}>)
-set(warnings_as_errors $<BOOL:${skyr_WARNINGS_AS_ERRORS}>)
-set(no_exceptions $<BOOL:${skyr_BUILD_WITHOUT_EXCEPTIONS}>)
-set(no_rtti $<BOOL:${skyr_BUILD_WITHOUT_RTTI}>)
-
-set(gnu $<CXX_COMPILER_ID:GNU>)
-set(clang $<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>)
-set(libcxx $<AND:${clang},$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>)
-set(msvc $<CXX_COMPILER_ID:MSVC>)
-
 foreach(
         file_name
         example_01.cpp

src/CMakeLists.txt

@@ -10,7 +10,9 @@ configure_file(
         ${PROJECT_BINARY_DIR}/include/skyr/version.hpp
 )
 
-add_subdirectory(v1)
+if (skyr_BUILD_V1)
+    add_subdirectory(v1)
+endif()
 if (skyr_BUILD_V2)
     add_subdirectory(v2)
 endif()

src/v1/CMakeLists.txt

@@ -86,17 +86,6 @@ set_target_properties(
 
 target_compile_features(skyr-url-v1 PUBLIC cxx_std_17)
 
-set(full_warnings $<BOOL:${skyr_FULL_WARNINGS}>)
-set(warnings_as_errors $<BOOL:${skyr_WARNINGS_AS_ERRORS}>)
-set(no_exceptions $<BOOL:${skyr_BUILD_WITHOUT_EXCEPTIONS}>)
-set(no_rtti $<BOOL:${skyr_BUILD_WITHOUT_RTTI}>)
-
-set(gnu $<CXX_COMPILER_ID:GNU>)
-set(clang $<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>)
-set(libcxx $<AND:${clang},$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>)
-set(msvc $<CXX_COMPILER_ID:MSVC>)
-set(clang_with_gnu_stdlib $<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<BOOL:${WIN32}>>,$<NOT:$<BOOL:${skyr_BUILD_WITH_LLVM_LIBCXX}>>>)
-
 target_compile_definitions(
         skyr-url-v1
         PRIVATE