From 20057dd1a66c1b69cbb25ff0bb6d4b1f883ad057 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Mon, 16 Sep 2024 08:56:55 -0700 Subject: [PATCH] fix(cmake): propagate GRAPHQL_BUILD_MODULES to consumers as target props --- cmake/cppgraphqlgen-functions.cmake | 2 ++ src/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/cppgraphqlgen-functions.cmake b/cmake/cppgraphqlgen-functions.cmake index 5114c6b7..3b5d1615 100644 --- a/cmake/cppgraphqlgen-functions.cmake +++ b/cmake/cppgraphqlgen-functions.cmake @@ -53,6 +53,7 @@ function(add_graphql_schema_target SCHEMA_TARGET) target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SCHEMA_HEADERS}) + get_target_property(GRAPHQL_BUILD_MODULES cppgraphqlgen::graphqlservice GRAPHQL_BUILD_MODULES) if(GRAPHQL_BUILD_MODULES) file(GLOB SCHEMA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx) target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET CXX_MODULES @@ -106,6 +107,7 @@ function(add_graphql_client_target CLIENT_TARGET) target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES ${CLIENT_HEADERS}) + get_target_property(GRAPHQL_BUILD_MODULES cppgraphqlgen::graphqlclient GRAPHQL_BUILD_MODULES) if(GRAPHQL_BUILD_MODULES) file(GLOB CLIENT_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx) target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET CXX_MODULES diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 64d1d21f..307a9325 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -337,6 +337,7 @@ if(GRAPHQL_BUILD_MODULES) target_sources(graphqlservice PUBLIC FILE_SET CXX_MODULES BASE_DIRS ${INCLUDE_ROOT} FILES ${INCLUDE_ROOT}/graphqlservice/Service.ixx) + set_target_properties(graphqlservice PROPERTIES GRAPHQL_BUILD_MODULES ON) endif() if(GRAPHQL_UPDATE_SAMPLES) @@ -373,6 +374,7 @@ if(GRAPHQL_BUILD_MODULES) target_sources(graphqlclient PUBLIC FILE_SET CXX_MODULES BASE_DIRS ${INCLUDE_ROOT} FILES ${INCLUDE_ROOT}/graphqlservice/Client.ixx) + set_target_properties(graphqlclient PROPERTIES GRAPHQL_BUILD_MODULES ON) endif() if(GRAPHQL_UPDATE_VERSION)