From 22457feb8ab57e7545d96f504225c7e9befa2d57 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 6 Feb 2023 15:27:58 -0800 Subject: [PATCH] Minor updates to CMake for a proof-of-concept project (#316) --- CMakeLists.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d82da4..a5e4dff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,11 @@ elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$") set(DIRECTX_ARCH arm64) endif() +if(VCPKG_TARGET_IS_XBOX) + set(BUILD_DX11 OFF) + set(BUILD_DX12 ON) +endif() + include(GNUInstallDirs) #--- Library @@ -167,11 +172,14 @@ if(NOT MINGW) endif() if(MINGW OR (NOT WIN32) OR VCPKG_TOOLCHAIN) - message(STATUS "Using VCPKG for DirectX-Headers and DirectXMath") - find_package(directx-headers CONFIG REQUIRED) find_package(directxmath CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath) - target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS) + target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath) + + if(NOT VCPKG_TARGET_IS_XBOX) + find_package(directx-headers CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers) + target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS) + endif() endif() #--- Package