From 784f0bf6ef6446f089caf75b788022521ed4f01f Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Wed, 24 Jul 2024 04:15:04 -0400 Subject: [PATCH] Fix CMakeLists --- Support/Sources/COM/CMakeLists.txt | 2 +- Support/Sources/ExportedABI/CMakeLists.txt | 5 ++--- Support/Sources/InternalABI/CMakeLists.txt | 6 +++--- Support/Sources/WindowsRuntime/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Support/Sources/COM/CMakeLists.txt b/Support/Sources/COM/CMakeLists.txt index 09b99291..8fd5cc6a 100644 --- a/Support/Sources/COM/CMakeLists.txt +++ b/Support/Sources/COM/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE SOURCES *.swift) add_library(COM STATIC ${SOURCES}) -target_link_libraries(COM PRIVATE COM_ABI) \ No newline at end of file +target_link_libraries(COM PRIVATE WindowsRuntime_ABI SWRT_InternalABI) \ No newline at end of file diff --git a/Support/Sources/ExportedABI/CMakeLists.txt b/Support/Sources/ExportedABI/CMakeLists.txt index 0526f38f..e1594563 100644 --- a/Support/Sources/ExportedABI/CMakeLists.txt +++ b/Support/Sources/ExportedABI/CMakeLists.txt @@ -1,3 +1,2 @@ -file(GLOB SOURCES *.c) -add_library(SWRT_Core INTERFACE) -target_include_directories(SWRT_Core PUBLIC include) \ No newline at end of file +add_library(WindowsRuntime_ABI INTERFACE) +target_include_directories(WindowsRuntime_ABI INTERFACE include) \ No newline at end of file diff --git a/Support/Sources/InternalABI/CMakeLists.txt b/Support/Sources/InternalABI/CMakeLists.txt index 6e28c8ff..8e051ef3 100644 --- a/Support/Sources/InternalABI/CMakeLists.txt +++ b/Support/Sources/InternalABI/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB SOURCES *.c) -add_library(SWRT_CoreInterop STATIC ${SOURCES}) -target_include_directories(SWRT_CoreInterop PUBLIC include) -target_link_libraries(SWRT_CoreInterop PUBLIC SWRT_Core) \ No newline at end of file +add_library(SWRT_InternalABI STATIC ${SOURCES}) +target_include_directories(SWRT_InternalABI PUBLIC include) +target_link_libraries(SWRT_InternalABI PUBLIC WindowsRuntime_ABI) \ No newline at end of file diff --git a/Support/Sources/WindowsRuntime/CMakeLists.txt b/Support/Sources/WindowsRuntime/CMakeLists.txt index ff81d4e8..599fddc3 100644 --- a/Support/Sources/WindowsRuntime/CMakeLists.txt +++ b/Support/Sources/WindowsRuntime/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE SOURCES *.swift) add_library(WindowsRuntime STATIC ${SOURCES}) -target_link_libraries(WindowsRuntime PRIVATE COM WindowsRuntime_ABI WindowsFoundation_ABI) \ No newline at end of file +target_link_libraries(WindowsRuntime PRIVATE COM WindowsRuntime_ABI SWRT_InternalABI) \ No newline at end of file