diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-04-23 14:17:22 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-04-30 13:27:25 +0200 |
| commit | 29ac85d55273e83a3ada19037959ae7c7823f5b7 (patch) | |
| tree | 060870053824413937ed2752e5b8f2c791e57530 /configure.ac | |
| parent | 36ac12c74210083ff3d699c9a57bf8b421939483 (diff) | |
| download | PROJ-29ac85d55273e83a3ada19037959ae7c7823f5b7.tar.gz PROJ-29ac85d55273e83a3ada19037959ae7c7823f5b7.zip | |
CMake build: add a NLOHMANN_JSON_ORIGIN=auto/external/internal setting allowing to choose which nlohmann/json to use
Co-authored-by: Mike Taves <mwtoews@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
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 |