rework deps population using CMake fetch_content module

Author: rmorozov

.gitmodules

@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.23.0)
 project(Jinja2Cpp VERSION 1.3.0)
 
-if (${CMAKE_VERSION} VERSION_GREATER "3.12")
-    cmake_policy(SET CMP0074 OLD)
-endif ()
-
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
     set(JINJA2CPP_IS_MAIN_PROJECT TRUE)
 else()

CMakeLists.txt

@@ -46,35 +46,39 @@ endfunction()
 include (./thirdparty/thirdparty-${JINJA2CPP_DEPS_MODE}.cmake)
 
 if(JINJA2CPP_BUILD_TESTS)
-    find_package(gtest QUIET)
+    find_package(GTest QUIET)
 
     if(gtest_FOUND)
         imported_target_alias(gtest ALIAS gtest::gtest)
     else()
-        message(STATUS "gtest not found, using submodule")
-        update_submodule(gtest)
-
+        message(STATUS "gtest not found, building own one")
         if(MSVC)
             if (THIRDPARTY_RUNTIME_TYPE STREQUAL "/MD" OR THIRDPARTY_RUNTIME_TYPE STREQUAL "/MDd")
                 set (gtest_force_shared_crt ON CACHE BOOL "" FORCE)
             else ()
                 set (gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
             endif ()
         endif ()
-
-        add_subdirectory(thirdparty/gtest EXCLUDE_FROM_ALL)
+        FetchContent_Declare(
+            googletest
+            GIT_REPOSITORY https://github.com/google/googletest.git
+            GIT_TAG main
+        )
+        FetchContent_MakeAvailable(googletest)
     endif()
 endif()
 
 if (NOT DEFINED JINJA2_PRIVATE_LIBS_INT)
-    set(JINJA2CPP_PRIVATE_LIBS ${JINJA2CPP_PRIVATE_LIBS} Boost::variant
-        Boost::filesystem Boost::algorithm Boost::lexical_cast Boost::json Boost::regex fmt RapidJson)
+    set(JINJA2CPP_PRIVATE_LIBS ${JINJA2CPP_PRIVATE_LIBS}
+        Boost::variant Boost::filesystem Boost::algorithm Boost::lexical_cast Boost::json
+        Boost::regex fmt RapidJson)
 else ()
     set (JINJA2CPP_PRIVATE_LIBS ${JINJA2_PRIVATE_LIBS_INT})
 endif ()
 
 if (NOT DEFINED JINJA2_PUBLIC_LIBS_INT)
-    set (JINJA2CPP_PUBLIC_LIBS ${JINJA2CPP_PUBLIC_LIBS} expected-lite variant-lite optional-lite string-view-lite)
+    set (JINJA2CPP_PUBLIC_LIBS ${JINJA2CPP_PUBLIC_LIBS}
+        expected-lite variant-lite optional-lite string-view-lite)
 else ()
     set (JINJA2CPP_PUBLIC_LIBS ${JINJA2_PUBLIC_LIBS_INT})
 endif ()

thirdparty/CMakeLists.txt

@@ -1,40 +1,72 @@
-update_submodule(nonstd/expected-lite)
-add_subdirectory(thirdparty/nonstd/expected-lite EXCLUDE_FROM_ALL)
+include(FetchContent)
 
-update_submodule(nonstd/variant-lite)
-add_subdirectory(thirdparty/nonstd/variant-lite EXCLUDE_FROM_ALL)
+FetchContent_Declare(
+    expected-lite
+    GIT_REPOSITORY https://github.com/martinmoene/expected-lite.git
+    GIT_TAG master
+)
+FetchContent_MakeAvailable(expected-lite)
 
-update_submodule(nonstd/optional-lite)
-add_subdirectory(thirdparty/nonstd/optional-lite EXCLUDE_FROM_ALL)
+FetchContent_Declare(
+    variant-lite
+    GIT_REPOSITORY https://github.com/martinmoene/variant-lite.git
+    GIT_TAG master
+)
+FetchContent_MakeAvailable(variant-lite)
 
-update_submodule(nonstd/string-view-lite)
-add_subdirectory(thirdparty/nonstd/string-view-lite EXCLUDE_FROM_ALL)
+FetchContent_Declare(
+    optional-lite
+    GIT_REPOSITORY https://github.com/martinmoene/optional-lite.git
+    GIT_TAG master
+)
+FetchContent_MakeAvailable(optional-lite)
+
+FetchContent_Declare(
+    string-view-lite
+    GIT_REPOSITORY https://github.com/martinmoene/string-view-lite.git
+    GIT_TAG master
+)
+FetchContent_MakeAvailable(string-view-lite)
 
-update_submodule(fmtlib)
 set (FMT_INSTALL ON CACHE BOOL "" FORCE)
-add_subdirectory(thirdparty/fmtlib EXCLUDE_FROM_ALL)
+FetchContent_Declare(
+    fmt
+    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+    GIT_TAG 10.1.1
+)
+FetchContent_MakeAvailable(fmt)
 
-update_submodule(json/rapid)
 set (RAPIDJSON_BUILD_DOC OFF CACHE BOOL "" FORCE)
 set (RAPIDJSON_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set (RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set (RAPIDJSON_BUILD_THIRDPARTY_GTEST OFF CACHE BOOL "" FORCE)
 set (RAPIDJSON_ENABLE_INSTRUMENTATION_OPT OFF CACHE BOOL "" FORCE)
-add_subdirectory(thirdparty/json/rapid EXCLUDE_FROM_ALL)
-find_package(RapidJSON)
+
+FetchContent_Declare(
+    rapidjson
+    GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+    GIT_TAG 973dc9c06dcd3d035ebd039cfb9ea457721ec213
+)
+#    GIT_TAG f9d53419e912910fd8fa57d5705fa41425428c35 - latest but broken revision
+FetchContent_MakeAvailable(rapidjson)
+find_package(RapidJSON REQUIRED)
 add_library(RapidJson INTERFACE)
 target_include_directories(RapidJson
     INTERFACE
         $<BUILD_INTERFACE:${RapidJSON_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>
-    )
-
+)
 if (JINJA2CPP_BUILD_TESTS)
-    update_submodule(json/nlohmann)
     set (JSON_BuildTests OFF CACHE BOOL "" FORCE)
     set (JSON_Install OFF CACHE BOOL "" FORCE)
     set (JSON_MultipleHeaders ON CACHE BOOL "" FORCE)
-    add_subdirectory(thirdparty/json/nlohmann EXCLUDE_FROM_ALL)
+
+    FetchContent_Declare(
+        nlohmann_json
+        GIT_REPOSITORY https://github.com/nlohmann/json.git
+        GIT_TAG develop
+    )
+    FetchContent_MakeAvailable(nlohmann_json)
 endif()
 
 install (FILES
@@ -49,4 +81,4 @@ install (TARGETS RapidJson
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
-    )
+)

thirdparty/fmtlib

@@ -1,4 +1,5 @@
-message(STATUS "'external-boost' dependencies mode selected for Jinja2Cpp. All dependencies are used as submodules except of boost")
+message(STATUS "'external-boost' dependencies mode selected for Jinja2Cpp. All
+dependencies are built from source pulled from github except of boost")
 
 include (./thirdparty/internal_deps.cmake)
 include (./thirdparty/external_boost_deps.cmake)

thirdparty/gtest

@@ -47,7 +47,7 @@ target_include_directories(RapidJson
         $<BUILD_INTERFACE:${RapidJSON_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>
     )
-    
+
 if (TARGET fmt-header-only)
     target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
     add_library(fmt ALIAS fmt-header-only)
@@ -74,5 +74,5 @@ install(TARGETS RapidJson
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
         )
-        
+
 include (./thirdparty/external_boost_deps.cmake)

thirdparty/internal_deps.cmake

@@ -1,4 +1,4 @@
-message(STATUS "'internal' dependencies mode selected for Jinja2Cpp. All dependencies are used as submodules")
+message(STATUS "'internal' dependencies mode selected for Jinja2Cpp. All dependencies will be built from source pulled from github")
 
 include (./thirdparty/internal_deps.cmake)
 
@@ -17,10 +17,10 @@ list(APPEND BOOST_INCLUDE_LIBRARIES
 
 include(FetchContent)
 FetchContent_Declare(
-  Boost
-  GIT_REPOSITORY https://github.com/boostorg/boost.git
-  GIT_TAG boost-1.83.0
-  PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../cmake/patches/0001-fix-skip-install-rules.patch" || true
+    Boost
+    GIT_REPOSITORY https://github.com/boostorg/boost.git
+    GIT_TAG boost-1.83.0
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../cmake/patches/0001-fix-skip-install-rules.patch" || true
 )
 FetchContent_MakeAvailable(Boost)