Release 1.1 preparation (#190)

Author: flexferrum

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0.1)
-project(Jinja2Cpp VERSION 1.0.0)
+project(Jinja2Cpp VERSION 1.1.0)
 
 if (${CMAKE_VERSION} VERSION_GREATER "3.12")
     cmake_policy(SET CMP0074 OLD)
@@ -11,7 +11,15 @@ else()
     set(JINJA2CPP_IS_MAIN_PROJECT FALSE)
 endif()
 
-set (JINJA2CPP_DEPS_MODE "internal" CACHE STRING "Jinja2Cpp dependency management mode (internal | external | external-boost | conan-build). See documentation for details. 'interal' is default.")
+# Options
+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_DEPS_MODE "external" 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)
+option(JINJA2CPP_BUILD_SHARED "Build shared linkage version of Jinja2Cpp" OFF)
+
 if (NOT JINJA2CPP_DEPS_MODE)
     set (JINJA2CPP_DEPS_MODE "internal")
 endif ()
@@ -27,27 +35,26 @@ endif ()
 
 if (JINJA2CPP_CXX_STANDARD LESS 14)
     message(FATAL_ERROR "Jinja2Cpp is required C++14 or greater standard set. Currently selected standard: ${JINJA2CPP_CXX_STANDARD}")
-else()
+else ()
     message(STATUS "Jinja2Cpp C++ standard: ${JINJA2CPP_CXX_STANDARD}")
 endif ()
 
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CLANG_CXX_FLAGS)
+set(GCC_CXX_FLAGS)
+set(MSVC_CXX_FLAGS)
 
 if (JINJA2CPP_WITH_COVERAGE)
-    message (STATUS "This is DEBUG build with enabled Code Coverage")
-    set (CMAKE_BUILD_TYPE Debug)
-    set (JINJA2CPP_COVERAGE_TARGET "jinja2cpp_build_coverage")
+    message(STATUS "This is DEBUG build with enabled Code Coverage")
+    set(CMAKE_BUILD_TYPE Debug)
+    set(JINJA2CPP_COVERAGE_TARGET "jinja2cpp_build_coverage")
     include(coverage)
     add_coverage_target("${JINJA2CPP_COVERAGE_TARGET}")
 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})
-
 if(NOT ${JINJA2CPP_WITH_SANITIZERS} STREQUAL "none")
     message (STATUS "Build with sanitizers enabled: ${JINJA2CPP_WITH_SANITIZERS}")
     set(_chosen_san)
@@ -61,51 +68,46 @@ if(NOT ${JINJA2CPP_WITH_SANITIZERS} STREQUAL "none")
     add_sanitizer_target(${JINJA2CPP_SANITIZE_TARGET})
 endif()
 
-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-    if (NOT UNIX)
-        if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-            set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wa,-mbig-obj -O1")
-        else ()
-            add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-        endif ()
-    else ()
-        set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fPIC")
-    endif ()
+if (UNIX)
+    set(GCC_CXX_FLAGS ${GCC_CXX_FLAGS} -fPIC)
+    set(CLANG_CXX_FLAGS ${CLANG_CXX_FLAGS} -fPIC)
 else ()
-    set (COMMON_MSVC_OPTS "/wd4503 /bigobj")
-    add_definitions(/DBOOST_ALL_NO_LIB)
-
+    set(GCC_CXX_FLAGS ${GCC_CXX_FLAGS} "-Wa,-mbig-obj" -O1)
+    if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    endif ()
+    add_definitions(-DBOOST_ALL_NO_LIB)
+    set(MSVC_CXX_FLAGS ${MSVC_CXX_FLAGS} /wd4503 /bigobj)
     # MSVC
+
     if (CMAKE_BUILD_TYPE MATCHES "Debug" AND JINJA2CPP_MSVC_RUNTIME_TYPE)
-        set (JINJA2CPP_MSVC_RUNTIME_TYPE "${JINJA2CPP_MSVC_RUNTIME_TYPE}d")
+        set(JINJA2CPP_MSVC_RUNTIME_TYPE "${JINJA2CPP_MSVC_RUNTIME_TYPE}d")
     endif ()
-    if (JINJA2CPP_DEPS_MODE MATCHES "conan-build" OR CMAKE_BUILD_TYPE STREQUAL "")
-        if (NOT JINJA2CPP_MSVC_RUNTIME_TYPE STREQUAL "")
-            set (MSVC_RUNTIME_DEBUG ${JINJA2CPP_MSVC_RUNTIME_TYPE})
-            set (MSVC_RUNTIME_RELEASE ${JINJA2CPP_MSVC_RUNTIME_TYPE})
+    if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        if (JINJA2CPP_DEPS_MODE MATCHES "conan-build" OR CMAKE_BUILD_TYPE STREQUAL "")
+            if (NOT JINJA2CPP_MSVC_RUNTIME_TYPE STREQUAL "")
+                set(MSVC_RUNTIME_DEBUG ${JINJA2CPP_MSVC_RUNTIME_TYPE})
+                set(MSVC_RUNTIME_RELEASE ${JINJA2CPP_MSVC_RUNTIME_TYPE})
+            endif ()
+            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_DEBUG}")
+            set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_RUNTIME_RELEASE}")
+            set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${MSVC_RUNTIME_RELEASE}")
+            set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/PROFILE")
+            set(Boost_USE_DEBUG_RUNTIME OFF)
+        elseif (CMAKE_BUILD_TYPE MATCHES "Debug")
+            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${JINJA2CPP_MSVC_RUNTIME_TYPE}")
+            set(Boost_USE_DEBUG_RUNTIME ON)
+        else ()
+            set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${JINJA2CPP_MSVC_RUNTIME_TYPE}")
+            set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${JINJA2CPP_MSVC_RUNTIME_TYPE}")
+            set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/PROFILE")
+            set(Boost_USE_DEBUG_RUNTIME OFF)
         endif ()
-        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_DEBUG} ${COMMON_MSVC_OPTS}")
-        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_RUNTIME_RELEASE}  ${COMMON_MSVC_OPTS}")
-        set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${MSVC_RUNTIME_RELEASE} ${COMMON_MSVC_OPTS}")
-        set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/PROFILE")
-        set (Boost_USE_DEBUG_RUNTIME OFF)
-    elseif (CMAKE_BUILD_TYPE MATCHES "Debug")
-        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${JINJA2CPP_MSVC_RUNTIME_TYPE} ${COMMON_MSVC_OPTS}")
-        set (Boost_USE_DEBUG_RUNTIME ON)
-    else ()
-        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${JINJA2CPP_MSVC_RUNTIME_TYPE}  ${COMMON_MSVC_OPTS}")
-        set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${JINJA2CPP_MSVC_RUNTIME_TYPE} ${COMMON_MSVC_OPTS}")
-        set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/PROFILE")
-        set (Boost_USE_DEBUG_RUNTIME OFF)
+        message(STATUS "Selected MSVC runtime type for Jinja2C++ library: '${JINJA2CPP_MSVC_RUNTIME_TYPE}'")
     endif ()
-    message (STATUS "Selected MSVC runtime type for Jinja2C++ library: '${JINJA2CPP_MSVC_RUNTIME_TYPE}'")
 endif()
 
 
-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)
-option(JINJA2CPP_BUILD_SHARED "Build shared linkage version of Jinja2Cpp" OFF)
-
 if (JINJA2CPP_BUILD_SHARED)
     set(LIB_LINK_TYPE SHARED)
 else()
@@ -132,18 +134,18 @@ set(JINJA2CPP_EXTRA_LIBS "" CACHE STRING "You can pass some libs that could used
 set(JINJA2CPP_PUBLIC_LIBS "${JINJA2CPP_EXTRA_LIBS}")
 separate_arguments(JINJA2CPP_PUBLIC_LIBS)
 if (JINJA2CPP_WITH_COVERAGE)
-   target_compile_options(
-           ${JINJA2CPP_COVERAGE_TARGET}
-        INTERFACE
-           -g -O0
+    target_compile_options(
+            ${JINJA2CPP_COVERAGE_TARGET}
+            INTERFACE
+            -g -O0
     )
     list(APPEND JINJA2CPP_PUBLIC_LIBS ${JINJA2CPP_COVERAGE_TARGET})
 endif()
 if (NOT JINJA2CPP_WITH_SANITIZERS STREQUAL "none")
-   target_compile_options(
-           ${JINJA2CPP_SANITIZE_TARGET}
-        INTERFACE
-           -g -O2
+    target_compile_options(
+            ${JINJA2CPP_SANITIZE_TARGET}
+            INTERFACE
+            -g -O2
     )
     list(APPEND JINJA2CPP_PUBLIC_LIBS ${JINJA2CPP_SANITIZE_TARGET})
 endif()
@@ -166,15 +168,21 @@ target_include_directories(${LIB_TARGET_NAME}
     )
 
 if (JINJA2CPP_STRICT_WARNINGS)
-    if (NOT MSVC)
-        if (UNIX)
-            target_compile_options(${LIB_TARGET_NAME} PRIVATE -Wall -Werror -Wno-unused-command-line-argument)
-        endif ()
-    else ()
-        target_compile_options(${LIB_TARGET_NAME} PRIVATE /W4)
+    if (UNIX)
+        set(GCC_CXX_FLAGS ${GCC_CXX_FLAGS} -Wall -Werror)
+        set(CLANG_CXX_FLAGS ${CLANG_CXX_FLAGS} -Wall -Werror -Wno-unused-command-line-argument)
+        set(MSVC_CXX_FLAGS ${MSVC_CXX_FLAGS} /W4)
     endif ()
 endif ()
 
+if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+    target_compile_options(${LIB_TARGET_NAME} PRIVATE ${GCC_CXX_FLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+    target_compile_options(${LIB_TARGET_NAME} PRIVATE ${CLANG_CXX_FLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
+    target_compile_options(${LIB_TARGET_NAME} PRIVATE ${MSVC_CXX_FLAGS})
+endif ()
+
 target_compile_definitions(${LIB_TARGET_NAME} PUBLIC BOOST_SYSTEM_NO_DEPRECATED BOOST_ERROR_CODE_HEADER_ONLY)
 
 set_target_properties(${LIB_TARGET_NAME} PROPERTIES
@@ -199,22 +207,22 @@ if (JINJA2CPP_BUILD_TESTS)
     target_link_libraries(jinja2cpp_tests gtest gtest_main nlohmann_json ${LIB_TARGET_NAME} ${EXTRA_TEST_LIBS} ${JINJA2CPP_PRIVATE_LIBS})
 
     set_target_properties(jinja2cpp_tests PROPERTIES
-        CXX_STANDARD ${JINJA2CPP_CXX_STANDARD}
-        CXX_STANDARD_REQUIRED ON)
+            CXX_STANDARD ${JINJA2CPP_CXX_STANDARD}
+            CXX_STANDARD_REQUIRED ON)
 
-	if (MSVC)
-	    target_compile_options(jinja2cpp_tests PRIVATE /bigobj)
-	endif ()
+    if (MSVC)
+        target_compile_options(jinja2cpp_tests PRIVATE /bigobj)
+    endif ()
 
     add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_data/simple_template1.j2tpl
-        COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/test_data ${CMAKE_CURRENT_BINARY_DIR}/test_data
-        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/test/test_data/simple_template1.j2tpl
-        COMMENT "Copy test data to the destination dir"
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_data/simple_template1.j2tpl
+            COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/test_data ${CMAKE_CURRENT_BINARY_DIR}/test_data
+            MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/test/test_data/simple_template1.j2tpl
+            COMMENT "Copy test data to the destination dir"
     )
 
     add_custom_target(CopyTestData ALL
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_data/simple_template1.j2tpl
+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_data/simple_template1.j2tpl
     )
 
     add_dependencies(jinja2cpp_tests CopyTestData)

README.md

@@ -4,8 +4,6 @@
 
 [![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/)
 [![Standard](https://img.shields.io/badge/c%2B%2B-14-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization)
-[![Build Status](https://travis-ci.org/jinja2cpp/Jinja2Cpp.svg?branch=master)](https://travis-ci.org/jinja2cpp/Jinja2Cpp)
-[![Build status](https://ci.appveyor.com/api/projects/status/vu59lw4r67n8jdxl/branch/master?svg=true)](https://ci.appveyor.com/project/flexferrum/jinja2cpp-n5hjm/branch/master)
 [![Coverage Status](https://codecov.io/gh/jinja2cpp/Jinja2Cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/jinja2cpp/Jinja2Cpp)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ff01fa4410ac417f8192dce78e919ece)](https://www.codacy.com/app/flexferrum/Jinja2Cpp_2?utm_source=github.com&utm_medium=referral&utm_content=jinja2cpp/Jinja2Cpp&utm_campaign=Badge_Grade)
 [![Github Releases](https://img.shields.io/github/release/jinja2cpp/Jinja2Cpp/all.svg)](https://github.com/jinja2cpp/Jinja2Cpp/releases)
@@ -110,7 +108,7 @@ Currently, Jinja2C++ supports the limited number of Jinja2 features. By the way,
 -  'with' statement
 -  'do' extension statement
 -  recursive loops
--  space control
+-  space control and 'raw'/'endraw' blocks
 
 Full information about Jinja2 specification support and compatibility table can be found here: [https://jinja2cpp.dev/docs/j2_compatibility.html](https://jinja2cpp.dev/docs/j2_compatibility.html).
 
@@ -127,25 +125,33 @@ Compilation of Jinja2C++ tested on the following compilers (with C++14 and C++17
 
 **Note:** Support of gcc version >= 9.x or clang version >= 8.0 depends on the version of the Boost library provided.
 
+### Build status
+
+| Compiler | Status  |
+|---------|---------:|
+| **MSVC** 2015 (x86, x64), **MinGW** 7 (x64), **MinGW** 8 (x64) | [![Build status](https://ci.appveyor.com/api/projects/status/vu59lw4r67n8jdxl/branch/master?svg=true)](https://ci.appveyor.com/project/flexferrum/jinja2cpp-n5hjm/branch/master) |
+| **X-Code** 9, 10, 11  | [![Build Status](https://travis-ci.org/jinja2cpp/Jinja2Cpp.svg?branch=master)](https://travis-ci.org/jinja2cpp/Jinja2Cpp) |
+| **MSVC** 2017 (x86, x64), **MSVC** 2019 (x86, x64), C++14/C++17 | [![](https://github.com/jinja2cpp/Jinja2Cpp/workflows/CI-windows-build/badge.svg)](https://github.com/jinja2cpp/Jinja2Cpp/actions?query=workflow%3ACI-windows-build) |
+| **g++** 5, 6, 7, 8, 9, **clang** 5, 6, 7, 8 C++14/C++17 | [![](https://github.com/jinja2cpp/Jinja2Cpp/workflows/CI-linux-build/badge.svg)](https://github.com/jinja2cpp/Jinja2Cpp/actions?query=workflow%3ACI-linux-build) |
+ 
 ## Build and install
 Jinja2C++ has several external dependencies:
 -  `boost` library (at least version 1.65) 
 -  `nonstd::expected-lite` [https://github.com/martinmoene/expected-lite](https://github.com/martinmoene/expected-lite)
 -  `nonstd::variant-lite` [https://github.com/martinmoene/variant-lite](https://github.com/martinmoene/variant-lite)
--  `nonstd::value-ptr-lite` [https://github.com/martinmoene/value-ptr-lite](https://github.com/martinmoene/value-ptr-lite)
 -  `nonstd::optional-lite` [https://github.com/martinmoene/optional-lite](https://github.com/martinmoene/optional-lite)
 -  `nonstd::string-view-lite` [https://github.com/martinmoene/string-view-lite](https://github.com/martinmoene/string-view-lite)
 -  `fmtlib::fmt` [https://github.com/fmtlib/fmt](https://github.com/fmtlib/fmt)
--  `robin-hood-hashing` [https://github.com/martinus/robin-hood-hashing](https://github.com/martinus/robin-hood-hashing)
+
+Examples of build scripts and different build configurations can be found here: [https://github.com/jinja2cpp/examples-build](https://github.com/jinja2cpp/examples-build)
 
 In simplest case to compile Jinja2C++ you need:
 
 1.  Install CMake build system (at least version 3.0)
-2.  Clone jinja2cpp repository and update submodules:
+2.  Clone jinja2cpp repository:
 
 ```
 > git clone https://github.com/flexferrum/Jinja2Cpp.git
-> git submodule -q update --init
 ```
 
 3.  Create build directory:
@@ -170,8 +176,7 @@ In simplest case to compile Jinja2C++ you need:
 > cmake --build . --target install
 ```
 
-In this case, Jinja2C++ will be built with internally-shipped dependencies and install them respectively. But Jinja2C++ supports build with externally-provided deps. Different Jinja2C++ usage scenarios can be found in this repository: https://github.com/jinja2cpp/examples-build
-
+In this case, Jinja2C++ will be built with internally-shipped dependencies and install them respectively. But Jinja2C++ supports build with externally-provided deps.
 ### Usage with conan.io dependency manager
 Jinja2C++ can be used as conan.io package. In this case, you should do the following steps:
 
@@ -227,7 +232,7 @@ You can define (via -D command-line CMake option) the following build flags:
 
 
 ### Build with C++17 standard enabled
-In case of C++17 standard enabled for your project you should define `variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_NONSTD optional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD` macros in the build settings.
+Jinja2C++ try to use standard versions of `std::variant`, `std::string_view` and `std::optional` if possible.
 
 ## Acknowledgments
 Thanks to **@manu343726** for CMake scripts improvement, bug hunting, and fixing and conan.io packaging.
@@ -238,12 +243,34 @@ Thanks to **@vitaut** for the amazing text formatting library.
 
 Thanks to **@martinus** for the fast hash maps implementation.
 
-Thanks to **@palchukovsky** for the great contribution into the codebase.
 
-Thanks to **@rmorozov** for sanitized builds setup.
+## Changelog
 
+### Version 1.1.0
+#### Changes and improvements
+- `batch` filter added
+- `slice` filter added
+- `format` filter added
+- `tojson` filter added
+- `striptags` filter added
+- `center` filter added
+- `xmlattr` filter added
+- `raw`/`endraw` tags added
+- repeat string operator added (e. g. `'a' * 5` will produce `'aaaaa'`)
+- support for templates metadata (`meta`/`endmeta` tags) added
+- `-fPIC` flag added to Linux build configuration
 
-## Changelog
+#### Fixed bugs
+- Fix behavior of lstripblock/trimblocks global settings. Now it fully corresponds to the origina jinja2
+- Fix bug with rendering parent `block` content if child doesn't override this block
+- Fix compilation issues with user-defined callables with number of arguments more than 2
+- Fix access to global Jinja2 functions from included/extended templates
+- Fix point of evaluation of macro params
+- Fix looping over the strings
+- Cleanup warnings
+
+#### Breaking changes
+- From now with C++17 standard enabled Jinja2C++ uses standard versions of types `variant`, `string_view` and `optional`
 
 ### Version 1.0.0
 #### Changes and improvements
@@ -281,7 +308,7 @@ Thanks to **@rmorozov** for sanitized builds setup.
 - `include`, `import` and `from` statements implemented. Now it's possible to include other templates and use macros from other templates.
 - `with` statement implemented
 - `do` statement implemented
-- Sample build projects for various Jinja2C++ usage variants created: https://github.com/jinja2cpp/examples-build
+- Sample build projects for various Jinja2C++ usage variants created: https://github.com/jinja2cpp/examples-build](https://github.com/jinja2cpp/examples-build)
 - Documentation site created for Jinja2C++: https://jinja2cpp.dev/
 
 #### Minor changes

cmake/public/jinja2cpp-config.cmake.in

@@ -54,7 +54,6 @@ endif()
 add_library(jinja2cpp STATIC IMPORTED)
 
 set_target_properties(jinja2cpp PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS "variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
 )
 

jinja2cpp.pc.in

@@ -3,10 +3,10 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
- Name: @PROJECT_NAME@
+Name: @PROJECT_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
 
  Requires:
 Libs: -L${libdir} -ljinja2cpp
-Cflags: -I${includedir} -Dvariant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD
+Cflags: -I${includedir}