Added DIRECTXTK_INTEGRATION build option to CMake

Author: walbourn

CMakeLists.txt

@@ -13,6 +13,8 @@ project (DXUT
 
 option(ENABLE_CODE_ANALYSIS "Use Static Code Analysis on build" OFF)
 
+option(DIRECTXTK_INTEGRATION "Support mixing with DirectX Tool Kit" OFF)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -37,25 +39,32 @@ include(GNUInstallDirs)
 
 #--- Core Library
 set(CORE_LIBRARY_HEADERS
-    Core/DDSTextureLoader.h
     Core/dxerr.h
     Core/DXUT.h
     Core/DXUTDevice11.h
     Core/DXUTmisc.h
-    Core/ScreenGrab.h
-    Core/WICTextureLoader.h
 )
 
 set(CORE_LIBRARY_SOURCES
-    Core/DDSTextureLoader.cpp
     Core/dxerr.cpp
     Core/DXUT.cpp
     Core/DXUTDevice11.cpp
     Core/DXUTmisc.cpp
-    Core/ScreenGrab.cpp
-    Core/WICTextureLoader.cpp
 )
 
+if (NOT DIRECTXTK_INTEGRATION)
+    list(APPEND CORE_LIBRARY_HEADERS
+      Core/DDSTextureLoader.h
+      Core/ScreenGrab.h
+      Core/WICTextureLoader.h
+    )
+    list(APPEND CORE_LIBRARY_SOURCES
+      Core/DDSTextureLoader.cpp
+      Core/ScreenGrab.cpp
+      Core/WICTextureLoader.cpp
+    )
+endif()
+
 add_library(${PROJECT_NAME} STATIC ${CORE_LIBRARY_SOURCES} ${CORE_LIBRARY_HEADERS})
 
 #--- Optional Library
@@ -111,6 +120,15 @@ target_include_directories(${PROJECT_NAME}Opt PUBLIC
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
   PRIVATE Core/)
 
+if (DIRECTXTK_INTEGRATION)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE USE_DIRECTXTK)
+  target_compile_definitions(${PROJECT_NAME}Opt PRIVATE USE_DIRECTXTK)
+
+  find_package(directxtk REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXTK)
+  target_link_libraries(${PROJECT_NAME}Opt PRIVATE Microsoft::DirectXTK)
+endif()
+
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 target_compile_features(${PROJECT_NAME}Opt PUBLIC cxx_std_11)
 

CMakePresets.json

@@ -94,6 +94,13 @@
       },
       "hidden": true
     },
+    {
+      "name": "DXTK",
+      "cacheVariables": {
+        "DIRECTXTK_INTEGRATION": true
+      },
+      "hidden": true
+    },
 
     { "name": "x64-Debug"        , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC" ] },
     { "name": "x64-Release"      , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC" ] },
@@ -102,6 +109,13 @@
     { "name": "arm64-Debug"      , "description": "MSVC for ARM64 (Debug)", "inherits": [ "base", "ARM64", "Debug", "MSVC" ] },
     { "name": "arm64-Release"    , "description": "MSVC for ARM64 (Release)", "inherits": [ "base", "ARM64", "Release", "MSVC" ] },
 
+    { "name": "x64-Debug-DXTK"     , "description": "MSVC for x64 (Debug) w/ DirectX Tool Kit", "inherits": [ "base", "x64", "Debug", "MSVC", "DXTK", "VCPKG" ] },
+    { "name": "x64-Release-DXTK"   , "description": "MSVC for x64 (Release) w/ DirectX Tool Kit", "inherits": [ "base", "x64", "Release", "MSVC", "DXTK", "VCPKG" ] },
+    { "name": "x86-Debug-DXTK"     , "description": "MSVC for x86 (Debug) w/ DirectX Tool Kit", "inherits": [ "base", "x86", "Debug", "MSVC", "DXTK", "VCPKG" ] },
+    { "name": "x86-Release-DXTK"   , "description": "MSVC for x86 (Release) w/ DirectX Tool Kit", "inherits": [ "base", "x86", "Release", "MSVC", "DXTK", "VCPKG" ] },
+    { "name": "arm64-Debug-DXTK"   , "description": "MSVC for ARM64 (Debug) w/ DirectX Tool Kit", "inherits": [ "base", "ARM64", "Debug", "MSVC", "DXTK", "VCPKG" ] },
+    { "name": "arm64-Release-DXTK" , "description": "MSVC for ARM64 (Release) w/ DirectX Tool Kit", "inherits": [ "base", "ARM64", "Release", "MSVC", "DXTK", "VCPKG" ] },
+
     { "name": "x64-Debug-Clang"    , "description": "Clang/LLVM for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "Clang" ] },
     { "name": "x64-Release-Clang"  , "description": "Clang/LLVM for x64 (Release)", "inherits": [ "base", "x64", "Release", "Clang" ] },
     { "name": "x86-Debug-Clang"    , "description": "Clang/LLVM for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "Clang" ], "environment": { "CXXFLAGS": "-m32" } },