From 634b5132a0b41591be215b8613804a0752f52624 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 22 Oct 2024 18:19:40 -0700 Subject: [PATCH 1/2] fix: only use include directory from taocpp::json --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bc8f5b07..7097a31f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -389,9 +389,10 @@ endif() if(GRAPHQL_USE_TAOCPP_JSON) find_package(taocpp-json CONFIG REQUIRED) + get_target_property(TAOCPP_JSON_INCLUDE_DIRS taocpp::json INTERFACE_INCLUDE_DIRECTORIES) set(BUILD_GRAPHQLJSON ON) add_library(graphqljson TaoCppJSONResponse.cpp) - target_link_libraries(graphqljson PRIVATE taocpp::json) + target_include_directories(graphqljson PRIVATE ${TAOCPP_JSON_INCLUDE_DIRS}) elseif(GRAPHQL_USE_RAPIDJSON) find_package(RapidJSON CONFIG REQUIRED) set(BUILD_GRAPHQLJSON ON) From 075e172d6970f587894fdbd2d13a194e0c49f4fc Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 22 Oct 2024 18:29:50 -0700 Subject: [PATCH 2/2] fix: export internal/DllExports.h --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7097a31f..8a402246 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,6 +88,7 @@ target_sources(graphql_internal_modules PUBLIC FILE_SET HEADERS FILES ${INCLUDE_ROOT}/graphqlservice/internal/Awaitable.h ${INCLUDE_ROOT}/graphqlservice/internal/Base64.h + ${INCLUDE_ROOT}/graphqlservice/internal/DllExports.h ${INCLUDE_ROOT}/graphqlservice/internal/Grammar.h ${INCLUDE_ROOT}/graphqlservice/internal/Introspection.h ${INCLUDE_ROOT}/graphqlservice/internal/Schema.h