bump dups & add boost json support (#226)

addresses #223, #230 

* bump deps

* update boost version to 1.79.0
* update googletest to latest version
* update nlohmann.json to v3.10.5
* update rapidjson to latest
* update fmt to latest
* add support for boost::json
* fix build
* fix code factor issue
* add pipelines verbosity
* move boost to master
* update boost to 1.80.0
* fix actions for clang
* replace boost submobule with fetchcontent
* fix test on windows
* patch boost cmake to workaround install export issue
* fix path to header
* disable strict warnings for linux build
* try to use vs 2017 on windows 2019
* remove msvc2017 from ci build
* remove comments
* change to interface option

Author: rmorozov

.clang-format

@@ -13,6 +13,7 @@ BraceWrapping:
   AfterStruct: true
 AccessModifierOffset: -4
 BinPackParameters: false
+AlignAfterOpenBracket: AlwaysBreak
 AlwaysBreakAfterReturnType: None
 AlwaysBreakAfterDefinitionReturnType: None
 AllowAllParametersOfDeclarationOnNextLine: false

.github/workflows/codeql-analysis.yml

@@ -52,8 +52,8 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    #    - name: Autobuild
+    # uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,5 +66,21 @@ jobs:
     #   make bootstrap
     #   make release
 
+    - name: Build
+      run: |
+        #!/bin/bash
+        set -ex
+        export BUILD_TARGET=all
+        export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=ON
+        export WORKSPACE=$GITHUB_WORKSPACE
+        if [ "${INPUT_COMPILER}" == "clang-12" ] ; then
+        export INPUT_BASE_FLAGS="-DJINJA2CPP_CXX_STANDARD=20" ;
+        fi
+        export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
+        mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY
+        sudo chmod gou+rw -R $WORKSPACE
+        cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=ON $EXTRA_FLAGS $WORKSPACE && cmake --build . --config Release --target all -- -j4
+
+
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/linux-build.yml

@@ -18,15 +18,15 @@ on:
       - '**.md'
 
 jobs:
-  linux-gcc-build:
+  linux-build:
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       max-parallel: 8
       matrix:
-        compiler: [g++-9, g++-10, g++-11]
+        compiler: [g++-9, g++-10, g++-11, clang++-12, clang++-13, clang++-14]
         base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
         build-config: [Release, Debug]
         build-shared: [TRUE, FALSE]
@@ -40,7 +40,7 @@ jobs:
             extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Setup environment
       env:
         INPUT_COMPILER: ${{ matrix.compiler }}
@@ -79,76 +79,14 @@ jobs:
         if [[ "${INPUT_COMPILER}" != "" ]]; then export CXX=${INPUT_COMPILER}; fi
         export BUILD_CONFIG=${INPUT_BASE_CONFIG}
         $CXX --version
+        cmake --version
         export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
         mkdir -p .build && cd .build
-        cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED  $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4
+        cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_STRICT_WARNINGS=OFF -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED  $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4
 
     - name: Test
       env:
         BUILD_CONFIG: ${{ matrix.build-config }}
       run: |
         cd .build && ctest -C $BUILD_CONFIG -V
 
-  linux-clang-build:
-
-    runs-on: ubuntu-latest
-    container:
-      image: ${{matrix.docker-image}}
-      env:
-        BUILD_DIRECTORY: /home/conan/.build
-        HOME: /home/conan
-
-    strategy:
-      fail-fast: false
-      max-parallel: 8
-      matrix:
-        compiler: [10, 11, 12]
-        base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
-        build-config: [Release, Debug]
-        build-shared: [TRUE, FALSE]
-
-        include:
-          - compiler: 10
-            docker-image: conanio/clang10
-          - compiler: 11
-            docker-image: conanio/clang11
-          - compiler: 12
-            docker-image: conanio/clang12-ubuntu16.04:1.39.0
-
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Build
-      env:
-        INPUT_COMPILER: clang-${{ matrix.compiler }}
-        INPUT_BASE_FLAGS: ${{ matrix.base-flags }}
-        INPUT_BASE_CONFIG: ${{ matrix.build-config }}
-        INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }}
-        INPUT_BUILD_SHARED: ${{ matrix.build-shared }}
-        HOME: /home/conan
-      run: |
-        #!/bin/bash
-        set -ex
-        export BUILD_TARGET=all
-        export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF
-        export BUILD_CONFIG=${INPUT_BASE_CONFIG}
-        export WORKSPACE=$GITHUB_WORKSPACE
-        #if [ "${INPUT_COMPILER}" != "" ]; then export CXX=${INPUT_COMPILER}; fi
-        if [ "${INPUT_COMPILER}" == "clang-12" ] ; then
-        export INPUT_BASE_FLAGS="-DJINJA2CPP_CXX_STANDARD=20" ;
-        fi
-        #$CXX --version
-        export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
-        mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY
-        sudo chmod gou+rw -R $WORKSPACE
-        cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED $EXTRA_FLAGS $WORKSPACE && cmake --build . --config $BUILD_CONFIG --target all -- -j4
-      shell: bash
-
-    - name: Test
-      env:
-        BUILD_CONFIG: ${{ matrix.build-config }}
-      run: |
-        cd $BUILD_DIRECTORY
-        ctest -C $BUILD_CONFIG -V
-

.github/workflows/windows-build.yml

@@ -25,24 +25,14 @@ jobs:
       fail-fast: false
       max-parallel: 20
       matrix:
-        compiler: [msvc-2019, msvc-2017]
+        compiler: [msvc-2019]
         base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
         build-config: [Release, Debug]
         build-platform: [x86, x64]
         build-runtime: ["", /MT, /MD]
         build-shared: [FALSE, TRUE]
 
         include:
-          - compiler: msvc-2017
-            build-platform: x86
-            run-machine: windows-2016
-            generator: Visual Studio 15 2017
-            vc_vars:  C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat
-          - compiler: msvc-2017
-            build-platform: x64
-            run-machine: windows-2016
-            generator: Visual Studio 15 2017 Win64
-            vc_vars:  C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat
           - compiler: msvc-2019
             build-platform: x86
             run-machine: windows-2019
@@ -56,7 +46,7 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Build
       shell: cmd
@@ -74,6 +64,7 @@ jobs:
         call "%VC_VARS%"
         mkdir -p .build
         cd .build
+        cmake --version
         cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
         cmake --build . --config %INPUT_BUILD_CONFIG% --verbose
 

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "thirdparty/gtest"]
     path = thirdparty/gtest
     url = https://github.com/google/googletest.git
-[submodule "thirdparty/boost"]
-    path = thirdparty/boost
-    url = https://github.com/boostorg/boost.git
+#[submodule "thirdparty/boost"]
+#    path = thirdparty/boost
+#    url = https://github.com/boostorg/boost.git
 [submodule "thirdparty/nonstd/expected-lite"]
 	path = thirdparty/nonstd/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git

CMakeLists.txt

@@ -15,6 +15,9 @@ endif()
 set(JINJA2CPP_SANITIZERS address+undefined memory)
 set(JINJA2CPP_WITH_SANITIZERS none CACHE STRING "Build with sanitizer")
 set_property(CACHE JINJA2CPP_WITH_SANITIZERS PROPERTY STRINGS ${JINJA2CPP_SANITIZERS})
+set(JINJA2CPP_WITH_JSON_BINDINGS boost nlohmann rapid all none)
+set(JINJA2CPP_WITH_JSON_BINDINGS all CACHE STRING "Build with json support")
+set_property(CACHE JINJA2CPP_WITH_JSON_BINDINGS PROPERTY STRINGS ${JINJA2CPP_WITH_JSON_BINDINGS})
 set (JINJA2CPP_DEPS_MODE "internal" CACHE STRING "Jinja2Cpp dependency management mode (internal | external | external-boost | conan-build). See documentation for details. 'interal' is default.")
 option(JINJA2CPP_BUILD_TESTS "Build Jinja2Cpp unit tests" ${JINJA2CPP_IS_MAIN_PROJECT})
 option(JINJA2CPP_STRICT_WARNINGS "Enable additional warnings and treat them as errors" ON)
@@ -263,13 +266,16 @@ macro (Jinja2CppGetTargetIncludeDir infix target)
     if (TARGET ${target})
         set (_J2CPP_VAR_NAME JINJA2CPP_${infix}_INCLUDE_DIRECTORIES)
         get_target_property(${_J2CPP_VAR_NAME} ${target} INTERFACE_INCLUDE_DIRECTORIES)
-    endif ()
+    else ()
+        message(WARNING "No target: ${target}")
+    endif()
+
 endmacro ()
 
-Jinja2CppGetTargetIncludeDir(EXPECTED-LITE expected-lite)
-Jinja2CppGetTargetIncludeDir(VARIANT-LITE variant-lite)
-Jinja2CppGetTargetIncludeDir(OPTIONAL-LITE optional-lite)
-Jinja2CppGetTargetIncludeDir(STRING-VIEW-LITE string-view-lite)
+Jinja2CppGetTargetIncludeDir(EXPECTED-LITE nonstd::expected-lite)
+Jinja2CppGetTargetIncludeDir(VARIANT-LITE nonstd::variant-lite)
+Jinja2CppGetTargetIncludeDir(OPTIONAL-LITE nonstd::optional-lite)
+Jinja2CppGetTargetIncludeDir(STRING-VIEW-LITE nonstd::string-view-lite)
 
 # Workaround for #14444 bug of CMake (https://gitlab.kitware.com/cmake/cmake/issues/14444)
 # We can't use EXPORT feature of 'install' as is due to limitation of subproject's targets installation

cmake/patches/0001-fix-skip-install-rules.patch

@@ -0,0 +1,25 @@
+From 857dc932fc32d3a1d30abac7724565812b446cd2 Mon Sep 17 00:00:00 2001
+From: Ruslan Morozov <ruslan.y.morozov@gmail.com>
+Date: Thu, 8 Dec 2022 21:11:49 +0300
+Subject: [PATCH] fix skip install rules
+
+---
+ include/BoostRoot.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/cmake/include/BoostRoot.cmake b/tools/cmake/include/BoostRoot.cmake
+index f2a51e1..a37f14d 100644
+--- a/tools/cmake/include/BoostRoot.cmake
++++ b/tools/cmake/include/BoostRoot.cmake
+@@ -90,7 +90,7 @@ else()
+   endif()
+ 
+   set(BUILD_TESTING OFF)
+-  set(CMAKE_SKIP_INSTALL_RULES ON)
++  set(CMAKE_SKIP_INSTALL_RULES OFF)
+ 
+ endif()
+ 
+-- 
+2.37.1 (Apple Git-137.1)
+