From 2a43b89533a2c62398a827eb504f06e034786ac2 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 24 Apr 2024 17:15:29 -0400 Subject: [PATCH] Don't build windows-headers on Win32 --- CMakeLists.txt | 5 ++++- src/spirv/CMakeLists.txt | 7 +++++-- src/util/CMakeLists.txt | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0ef00b..9b2df0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,10 @@ option(BUILD_EXAMPLE "Build example application" ON) find_package(Vulkan REQUIRED) find_package(SPIRV-Headers REQUIRED) -add_subdirectory(include/windows) +if (NOT WIN32) + add_subdirectory(include/windows) +endif() + add_subdirectory(src/util) add_subdirectory(src/spirv) add_subdirectory(src/dxbc) diff --git a/src/spirv/CMakeLists.txt b/src/spirv/CMakeLists.txt index fb50591..f497f28 100644 --- a/src/spirv/CMakeLists.txt +++ b/src/spirv/CMakeLists.txt @@ -10,5 +10,8 @@ target_sources(dxbc-spirv PRIVATE spirv_module.h ) target_include_directories(dxbc-spirv SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(dxbc-spirv PUBLIC windows-headers SPIRV-Headers::SPIRV-Headers) -target_compile_options(dxbc-spirv PRIVATE -w) \ No newline at end of file +target_link_libraries(dxbc-spirv PUBLIC SPIRV-Headers::SPIRV-Headers) +target_compile_options(dxbc-spirv PRIVATE -w) +if (NOT WIN32) + target_link_libraries(dxbc-spirv PUBLIC windows-headers) +endif() \ No newline at end of file diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index d2b4dc7..c04ffae 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -30,5 +30,7 @@ target_sources(dxbc-util PRIVATE util_string.h ) target_include_directories(dxbc-util SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(dxbc-util PUBLIC windows-headers) -target_compile_options(dxbc-util PRIVATE -w) \ No newline at end of file +target_compile_options(dxbc-util PRIVATE -w) +if (NOT WIN32) + target_link_libraries(dxbc-util PUBLIC windows-headers) +endif() \ No newline at end of file