From 7c59a55a8f69e61358fd9f04420304cc16404586 Mon Sep 17 00:00:00 2001 From: wallisc Date: Thu, 29 Jun 2017 21:58:14 -0700 Subject: [PATCH] Fixing embarrassing Cmake file issues --- CMakeLists.txt | 14 +++++++------- examples/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1375ed7..2c625d59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,9 +362,9 @@ if (WIN32 AND NOT NO_DX12) if(DX12SDK_FOUND) # The DX12 SDK (Win 10 SDK) is a super-set of the DXSDK set(DXSDK_FOUND TRUE) - - set(DXSDK_INCLUDE_DIR $(D3D12_INCLUDE_DIRS)) - set(DXSDK_LIBRARIES $(D3D12_LIBRARIES)) + + set(DXSDK_INCLUDE_DIR ${D3D12_INCLUDE_DIRS}) + set(DXSDK_LIBRARIES ${D3D12_LIBRARIES}) endif() endif() @@ -578,12 +578,12 @@ if (WIN32) -DGLEW_STATIC ) endif() - - if(DX12SDK_FOUND AND NOT NO_DX12) - add_definitions( + + if(DX12SDK_FOUND AND NOT NO_DX12) + add_definitions( -DOPENSUBDIV_HAS_DX12 ) - endif() + endif() if (DXSDK_FOUND AND NOT NO_DX11) add_definitions( diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index bd9177a9..26885518 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -69,7 +69,7 @@ if (NOT NO_OPENGL) endif() endif() -if (DXSDK_FOUND AND NOT NO_DX) +if (DXSDK_FOUND AND NOT NO_DX11) add_subdirectory(dxViewer)