diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-04-30 14:06:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 14:06:29 +0200 |
| commit | 9d1a7a68c5d0689b4854919c92725ee01393eea4 (patch) | |
| tree | 207791ef1f0b8fd647cb848de0a3695058ac549e /test/unit | |
| parent | 546743c838d8c3009fb864718ee77858ff843b29 (diff) | |
| parent | 29ac85d55273e83a3ada19037959ae7c7823f5b7 (diff) | |
| download | PROJ-9d1a7a68c5d0689b4854919c92725ee01393eea4.tar.gz PROJ-9d1a7a68c5d0689b4854919c92725ee01393eea4.zip | |
Merge pull request #2686 from rouault/nlohmann_json_update
Update internal nlohmann/json to 3.9.1, and add a CMake option to be able to use external nlohmann/json
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 1a080ac5..53a14ced 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -166,6 +166,10 @@ add_executable(test_defmodel target_link_libraries(test_defmodel PRIVATE GTest::gtest PRIVATE ${PROJ_LIBRARIES}) +if(NLOHMANN_JSON STREQUAL "external") + target_compile_definitions(test_defmodel PRIVATE EXTERNAL_NLOHMANN_JSON) + target_link_libraries(test_defmodel PRIVATE nlohmann_json::nlohmann_json) +endif() add_test(NAME test_defmodel COMMAND test_defmodel) set_property(TEST test_defmodel PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -176,6 +180,10 @@ add_executable(test_tinshift target_link_libraries(test_tinshift PRIVATE GTest::gtest PRIVATE ${PROJ_LIBRARIES}) +if(NLOHMANN_JSON STREQUAL "external") + target_compile_definitions(test_tinshift PRIVATE EXTERNAL_NLOHMANN_JSON) + target_link_libraries(test_tinshift PRIVATE nlohmann_json::nlohmann_json) +endif() add_test(NAME test_tinshift COMMAND test_tinshift) set_property(TEST test_tinshift PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) |