Comment out attempts

tristanlabelle · Sep 27, 2024 · 959d631 · 959d631
1 parent b077295
commit 959d631
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Generator/InteropTests/WinRTComponent/CMakeLists.txt b/Generator/InteropTests/WinRTComponent/CMakeLists.txt
@@ -42,6 +42,4 @@ ExternalProject_Add(WinRTComponent
     TEST_COMMAND "")
 
 # Define the projection build
-add_subdirectory(
-    "${PROJECTION_DIR}"
-    "${CMAKE_CURRENT_BINARY_DIR}/Projection/Build")
+add_subdirectory("${PROJECTION_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Projection/Build")
diff --git a/Generator/Sources/SwiftWinRT/writeProjectionFiles.swift b/Generator/Sources/SwiftWinRT/writeProjectionFiles.swift
@@ -108,9 +108,9 @@ fileprivate func writeSwiftModuleFiles(_ module: Module, directoryPath: String,
                 "PROPERTIES", "Swift_MODULE_NAME", .autoquote(module.name))
             // Workaround CMake error with mismatching module names:
             // "CMake can not determine linker language for target: <blah>"
-            writer.writeSingleLineCommand(
-                "set_target_properties", .autoquote(targetName),
-                "PROPERTIES", "LINKER_LANGUAGE", "Swift")
+            // writer.writeSingleLineCommand(
+            //     "set_target_properties", .autoquote(targetName),
+            //     "PROPERTIES", "LINKER_LANGUAGE", "Swift")
         }
         writer.writeTargetLinkLibraries(targetName, .public,
             [ cmakeOptions.getTargetName(moduleName: module.abiModuleName), SupportModules.WinRT.moduleName ]
@@ -145,9 +145,9 @@ fileprivate func writeNamespaceModuleFiles(_ module: Module, directoryPath: Stri
                     "PROPERTIES", "Swift_MODULE_NAME", .autoquote(namespaceModuleName))
                 // Workaround CMake error with mismatching module names:
                 // "CMake can not determine linker language for target: <blah>"
-                writer.writeSingleLineCommand(
-                    "set_target_properties", .autoquote(targetName),
-                    "PROPERTIES", "LINKER_LANGUAGE", "Swift")
+                // writer.writeSingleLineCommand(
+                //     "set_target_properties", .autoquote(targetName),
+                //     "PROPERTIES", "LINKER_LANGUAGE", "Swift")
             }
             writer.writeTargetLinkLibraries(targetName, .public, [ cmakeOptions.getTargetName(moduleName: module.name) ])
         }

diff --git a/Support/Sources/WindowsRuntime/CMakeLists.txt b/Support/Sources/WindowsRuntime/CMakeLists.txt
@@ -4,4 +4,5 @@ target_link_libraries(WindowsRuntime PUBLIC COM WindowsRuntime_ABI)
 target_link_libraries(WindowsRuntime PRIVATE SWRT_InternalABI)
 
 # Workaround for CMake not propagating include dirs
-target_include_directories(WindowsRuntime INTERFACE "$<TARGET_FILE_DIR:ABIBindings>")
+# target_include_directories(WindowsRuntime INTERFACE "$<TARGET_FILE_DIR:ABIBindings>")
+# target_include_directories(WindowsRuntime INTERFACE "$<TARGET_PROPERTY:SWRT_InternalABI,INCLUDE_DIRECTORIES>")