From 29ac85d55273e83a3ada19037959ae7c7823f5b7 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 23 Apr 2021 14:17:22 +0200 Subject: CMake build: add a NLOHMANN_JSON_ORIGIN=auto/external/internal setting allowing to choose which nlohmann/json to use Co-authored-by: Mike Taves --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3e28bbf1..4ff2ad9f 100644 --- a/configure.ac +++ b/configure.ac @@ -358,8 +358,10 @@ dnl --------------------------------------------------------------------------- dnl Generate files dnl --------------------------------------------------------------------------- -AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile include/proj/internal/Makefile - include/proj/internal/nlohmann/Makefile +AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile + include/proj/internal/Makefile + include/proj/internal/vendor/Makefile + include/proj/internal/vendor/nlohmann/Makefile test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile man/Makefile man/man1/Makefile data/Makefile]) if ! test "x$with_external_gtest" = "xyes" ; then -- cgit v1.2.3