From 4d697bb770f6b2b91dac854d84c7dcb1079e7abe Mon Sep 17 00:00:00 2001 From: Owen Voorhees Date: Thu, 23 Oct 2025 20:30:04 -0700 Subject: [PATCH] Export 'ForPlugin' targets in the CMake build --- Sources/SKLogging/CMakeLists.txt | 15 ++++++++------- .../ToolsProtocolsSwiftExtensions/CMakeLists.txt | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Sources/SKLogging/CMakeLists.txt b/Sources/SKLogging/CMakeLists.txt index 452fc20b5..305acbbd0 100644 --- a/Sources/SKLogging/CMakeLists.txt +++ b/Sources/SKLogging/CMakeLists.txt @@ -16,16 +16,17 @@ target_link_libraries(SKLogging PRIVATE target_link_libraries(SKLogging PUBLIC ToolsProtocolsSwiftExtensions) -add_library(SKLoggingForPlugin STATIC ${sources}) -set_target_properties(SKLoggingForPlugin PROPERTIES +add_library(_SKLoggingForPlugin STATIC ${sources}) +set_target_properties(_SKLoggingForPlugin PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) -target_compile_options(SKLoggingForPlugin PRIVATE +target_compile_options(_SKLoggingForPlugin PRIVATE $<$: - "SHELL:-module-alias ToolsProtocolsSwiftExtensions=ToolsProtocolsSwiftExtensionsForPlugin" + "SHELL:-module-alias ToolsProtocolsSwiftExtensions=_ToolsProtocolsSwiftExtensionsForPlugin" >) -target_link_libraries(SKLoggingForPlugin PRIVATE +target_link_libraries(_SKLoggingForPlugin PRIVATE $<$>:Foundation>) -target_link_libraries(SKLoggingForPlugin PUBLIC - ToolsProtocolsSwiftExtensionsForPlugin) +target_link_libraries(_SKLoggingForPlugin PUBLIC + _ToolsProtocolsSwiftExtensionsForPlugin) set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS SKLogging) +set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS _SKLoggingForPlugin) diff --git a/Sources/ToolsProtocolsSwiftExtensions/CMakeLists.txt b/Sources/ToolsProtocolsSwiftExtensions/CMakeLists.txt index 2ce1b4ef7..1159bdead 100644 --- a/Sources/ToolsProtocolsSwiftExtensions/CMakeLists.txt +++ b/Sources/ToolsProtocolsSwiftExtensions/CMakeLists.txt @@ -20,12 +20,13 @@ target_link_libraries(ToolsProtocolsSwiftExtensions PUBLIC target_link_libraries(ToolsProtocolsSwiftExtensions PRIVATE $<$>:Foundation>) -add_library(ToolsProtocolsSwiftExtensionsForPlugin STATIC ${sources}) -set_target_properties(ToolsProtocolsSwiftExtensionsForPlugin PROPERTIES +add_library(_ToolsProtocolsSwiftExtensionsForPlugin STATIC ${sources}) +set_target_properties(_ToolsProtocolsSwiftExtensionsForPlugin PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) -target_link_libraries(ToolsProtocolsSwiftExtensionsForPlugin PUBLIC +target_link_libraries(_ToolsProtocolsSwiftExtensionsForPlugin PUBLIC ToolsProtocolsCAtomics) -target_link_libraries(ToolsProtocolsSwiftExtensionsForPlugin PRIVATE +target_link_libraries(_ToolsProtocolsSwiftExtensionsForPlugin PRIVATE $<$>:Foundation>) set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS ToolsProtocolsSwiftExtensions) +set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS _ToolsProtocolsSwiftExtensionsForPlugin)