update to json 3.2 and catch 2.3, clean cmake

test/CMakeLists.txt

@@ -1,68 +1,70 @@
-cmake_minimum_required(VERSION 3.1)
-
 ##
 ## HUNTER
 ##
 option(HUNTER_ENABLED "Use hunter to manage dependencies" OFF)
 if(HUNTER_ENABLED)
-    include("../cmake/HunterGate.cmake")
-    HunterGate(
-        URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz"
-        SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d"
-    )
+  include("../cmake/HunterGate.cmake")
+  HunterGate(
+    URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz"
+    SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d"
+  )
 endif()
 
-##
-## PROJECT
-## name and version
-##
-project(inja-testing LANGUAGES CXX VERSION ${INJA_VERSION})
 
 ##
 ## TARGETS
 ##
-set(UNITTEST_TARGET_NAME "inja_unit")
-file(GLOB TEST_SOURCES "src/*.cpp")
-add_executable(${UNITTEST_TARGET_NAME} ${TEST_SOURCES})
+add_executable(inja_test
+  src/unit-files.cpp
+  src/unit-renderer.cpp
+  src/unit-string-helper.cpp
+  src/unit.cpp
+)
+
 
 ##
 ## INCLUDES
 ##
 if(HUNTER_ENABLED) # Use Hunter to manage dependencies
-    # Add Catch framework
-    hunter_add_package(Catch)
-    find_package(Catch CONFIG REQUIRED)
-    # Add JSON package
-    hunter_add_package(nlohmann_json)
-    find_package(nlohmann_json CONFIG REQUIRED)
-    # Add dependencies to target
-    target_link_libraries(${UNITTEST_TARGET_NAME} Catch::Catch)
-    target_link_libraries(${UNITTEST_TARGET_NAME} nlohmann_json)
-    target_link_libraries(${UNITTEST_TARGET_NAME} inja)
+  # Add Catch framework
+  hunter_add_package(Catch)
+  find_package(Catch CONFIG REQUIRED)
+
+  # Add JSON package
+  hunter_add_package(nlohmann_json)
+  find_package(nlohmann_json CONFIG REQUIRED)
+
+  # Add dependencies to target
+  target_link_libraries(inja_test Catch::Catch nlohmann_json inja)
 else() # Manage dependencies manually
-    # Prepare "Catch" library for other executables
-    add_library(Catch INTERFACE)
-    target_include_directories(Catch INTERFACE "thirdparty")
-    # Prepare "JSON" library for other executables
-    add_library(JSON INTERFACE)
-    target_include_directories(JSON INTERFACE "thirdparty")
-    # Add dependencies to target
-    target_link_libraries(${UNITTEST_TARGET_NAME} Catch)
-    target_link_libraries(${UNITTEST_TARGET_NAME} JSON)
-    target_link_libraries(${UNITTEST_TARGET_NAME} inja)
+  # Prepare "Catch" library for other executables
+  add_library(Catch INTERFACE)
+  target_include_directories(Catch INTERFACE "thirdparty")
+
+  # Prepare "JSON" library for other executables
+  add_library(JSON INTERFACE)
+  target_include_directories(JSON INTERFACE "thirdparty")
+
+  # Add dependencies to target
+  target_link_libraries(inja_test Catch JSON inja)
 endif()
 
-# Copy test files to build directory
+
+##
+## Copy test files to build directory
+##
 add_custom_command(
-  TARGET ${UNITTEST_TARGET_NAME} POST_BUILD
+  TARGET inja_test POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_SOURCE_DIR}/test/data
   ${CMAKE_CURRENT_BINARY_DIR}/data
 )
+
+
 ##
 ## Add tests to make
 ##
-add_test(NAME "${UNITTEST_TARGET_NAME}_default"
-  COMMAND ${UNITTEST_TARGET_NAME}
+add_test(NAME inja_test
+  COMMAND inja_test
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

test/src/unit-renderer.cpp

@@ -257,7 +257,7 @@ TEST_CASE("callbacks") {
 		return number1 * number2 * number3;
 	});
 
-	env.add_callback("multiply", 0, [&env](inja::Parsed::Arguments args, json data) {
+	env.add_callback("multiply", 0, [](inja::Parsed::Arguments args, json data) {
 		return 1.0;
 	});