diff --git a/CMakeLists.txt b/CMakeLists.txt index a2c7a12..f111f1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,11 +72,21 @@ endif(CPPDAP_BUILD_TESTS) # JSON library ########################################################### -if((CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE AND CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE) OR - (CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE AND CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE) OR - (CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE AND CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE)) +if(CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE) + list(APPEND CPPDAP_EXTERNAL_JSON_PACKAGES "CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE") +endif() +if(CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE) + list(APPEND CPPDAP_EXTERNAL_JSON_PACKAGES "CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE") +endif() +if(CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE) + list(APPEND CPPDAP_EXTERNAL_JSON_PACKAGES "CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE") +endif() +list(LENGTH CPPDAP_EXTERNAL_JSON_PACKAGES CPPDAP_EXTERNAL_JSON_PACKAGES_COUNT) + +if(CPPDAP_EXTERNAL_JSON_PACKAGES_COUNT GREATER 1) message(FATAL_ERROR "At most one of CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE, \ -CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE, and CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE can be set.") +CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE, and CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE can \ +be set, but ${CPPDAP_EXTERNAL_JSON_PACKAGES} were all set.") elseif(CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE) find_package(nlohmann_json CONFIG REQUIRED) set(CPPDAP_JSON_LIBRARY "nlohmann") diff --git a/src/jsoncpp_json_serializer.cpp b/src/jsoncpp_json_serializer.cpp index e7dc092..44269aa 100644 --- a/src/jsoncpp_json_serializer.cpp +++ b/src/jsoncpp_json_serializer.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Microsoft +// Copyright 2023 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/jsoncpp_json_serializer.h b/src/jsoncpp_json_serializer.h index 82d97ba..6bdf6a4 100644 --- a/src/jsoncpp_json_serializer.h +++ b/src/jsoncpp_json_serializer.h @@ -1,4 +1,4 @@ -// Copyright 2023 Microsoft +// Copyright 2023 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -131,4 +131,4 @@ struct JsonCppSerializer : public dap::Serializer { } // namespace json } // namespace dap -#endif // dap_jsoncpp_json_serializer_h \ No newline at end of file +#endif // dap_jsoncpp_json_serializer_h