Adding IREE_TARGET_GUI_LINKOPTS to remove custom linkopts use.
diff --git a/build_tools/cmake/iree_copts.cmake b/build_tools/cmake/iree_copts.cmake index 9b84ae2..6ad259f 100644 --- a/build_tools/cmake/iree_copts.cmake +++ b/build_tools/cmake/iree_copts.cmake
@@ -293,6 +293,14 @@ ${_IREE_PTHREADS_LINKOPTS} ) +# Add to LINKOPTS on a binary to configure it for X/Wayland/Windows/etc +# depending on the target cross-compilation platform. +if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + set(IREE_TARGET_GUI_LINKOPTS "-SUBSYSTEM:WINDOWS") +else() + set(IREE_TARGET_GUI_LINKOPTS "") +endif() + # TODO(benvanik): remove the ABSL usage here; we aren't abseil. set(IREE_TEST_COPTS "${ABSL_TEST_COPTS}")
diff --git a/iree/samples/vulkan/CMakeLists.txt b/iree/samples/vulkan/CMakeLists.txt index c3de407..960c0e5 100644 --- a/iree/samples/vulkan/CMakeLists.txt +++ b/iree/samples/vulkan/CMakeLists.txt
@@ -39,12 +39,6 @@ return() endif() -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - set(_GUI_LINKOPTS "-SUBSYSTEM:WINDOWS") -else() - set(_GUI_LINKOPTS "") -endif() - iree_cc_binary( NAME vulkan_inference_gui @@ -60,5 +54,5 @@ iree::vm::bytecode_module iree::vm::ref_cc LINKOPTS - "${_GUI_LINKOPTS}" + "${IREE_TARGET_GUI_LINKOPTS}" )
diff --git a/iree/testing/vulkan/CMakeLists.txt b/iree/testing/vulkan/CMakeLists.txt index 6ceb5dc..f9257bb 100644 --- a/iree/testing/vulkan/CMakeLists.txt +++ b/iree/testing/vulkan/CMakeLists.txt
@@ -45,12 +45,6 @@ Vulkan::Vulkan ) -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - set(_GUI_LINKOPTS "-SUBSYSTEM:WINDOWS") -else() - set(_GUI_LINKOPTS "") -endif() - iree_cc_binary( NAME iree-run-module-vulkan-gui @@ -70,5 +64,5 @@ iree::vm iree::vm::bytecode_module LINKOPTS - "${_GUI_LINKOPTS}" + "${IREE_TARGET_GUI_LINKOPTS}" )