Merge branch 'main' into add-target-libs

open-telemetry · May 3, 2023 · 2ab56e7 · 2ab56e7
2 parents 0002eb2 + 8c75041
commit 2ab56e7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake
@@ -33,6 +33,8 @@ find_package(nlohmann_json QUIET)
 set(nlohmann_json_clone FALSE)
 if(nlohmann_json_FOUND)
   message(STATUS "nlohmann::json dependency satisfied by: package")
+elseif(TARGET nlohmann_json)
+  message(STATUS "nlohmann::json is already added as a CMake target!")
 elseif(EXISTS ${PROJECT_SOURCE_DIR}/.git
        AND EXISTS
            ${PROJECT_SOURCE_DIR}/third_party/nlohmann-json/CMakeLists.txt)