Pull in newer C++/WinRT

Author: fredemmott

CMakeLists.txt

@@ -14,43 +14,23 @@ add_compile_options(
   "$<$<CONFIG:Debug>:/fsanitize=address>"
 )
 
-include(CheckCXXSourceCompiles)
-check_cxx_source_compiles("
-#include <winrt/base.h>
-int main() { return 0; }"
-  CAN_INCLUDE_CPPWINRT)
-
-if(NOT CAN_INCLUDE_CPPWINRT)
-  add_compile_options("/await")
-  check_cxx_source_compiles("
-#include <winrt/base.h>
-int main() { return 0; }"
-    CAN_INCLUDE_CPPWINRT_WITH_AWAIT)
-
-  if(NOT CAN_INCLUDE_CPPWINRT_WITH_AWAIT)
-    message(FATAL_ERROR "Can't figure out build options for C++/Winrt")
-  endif()
-
-  message(WARNING "Using C++/WinRT from old Windows SDK; requires pre-C++20 coroutines (/await)")
-endif()
-
 function(add_cppremapper_executable TARGET)
   add_executable(${TARGET} ${ARGN})
   target_link_libraries(
-    " ${TARGET} "
+    "${TARGET}"
     PRIVATE
     LibCppRemapper
   )
   add_custom_command(
-    TARGET " ${TARGET} "
+    TARGET "${TARGET}"
     POST_BUILD
     COMMAND
-    " ${CMAKE_COMMAND} "
+    "${CMAKE_COMMAND}"
     -E copy
-    " $<TARGET_RUNTIME_DLLS:${TARGET}> "
-    " $<TARGET_FILE_DIR:${TARGET}> "
+    "$<TARGET_RUNTIME_DLLS:${TARGET}>"
+    "$<TARGET_FILE_DIR:${TARGET}>"
   )
-  install(TARGETS " ${TARGET} ")
+  install(TARGETS "${TARGET}")
 endfunction()
 
 add_subdirectory(third-party)

lib/CMakeLists.txt

@@ -42,17 +42,22 @@ target_link_libraries(
   ThirdParty-ViGEmClient
   ThirdParty-VJoy
 )
+target_link_libraries(
+  LibCppRemapper
+  PUBLIC
+  ThirdParty-CppWinRT
+)
 target_include_directories(
   LibCppRemapper
   PUBLIC
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
-target_compile_options(
+
+install(
+  TARGETS
   LibCppRemapper
-  PRIVATE
-  /await:strict # C++20 standard-compliant
+  LIBRARY
 )
-install(TARGETS LibCppRemapper)
 
 add_library(LibCppRemapper-compat INTERFACE)
 target_link_libraries(LibCppRemapper-compat INTERFACE LibCppRemapper)

third-party/CMakeLists.txt

@@ -1,3 +1,4 @@
 include(catch.cmake)
+include(cppwinrt.cmake)
 include(vjoy.cmake)
 include(vigemclient.cmake)

third-party/cppwinrt.cmake

@@ -0,0 +1,25 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+  EP_CppWinRT
+  URL "https://github.com/microsoft/cppwinrt/releases/download/2.0.220912.1/Microsoft.Windows.CppWinRT.2.0.220912.1.nupkg"
+  URL_HASH "SHA256=d57e487b4e35d33ac7e808d4b63a664b99802047a8044eadf130e8048668252a"
+
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND
+  "<SOURCE_DIR>/bin/cppwinrt.exe"
+  -in "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}"
+  -output "<BINARY_DIR>/include"
+  INSTALL_COMMAND ""
+
+  EXCLUDE_FROM_ALL
+)
+message(STATUS "Windows target version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+
+ExternalProject_Get_property(EP_CppWinRT SOURCE_DIR)
+ExternalProject_Get_property(EP_CppWinRT BINARY_DIR)
+
+add_library(ThirdParty-CppWinRT INTERFACE)
+add_dependencies(ThirdParty-CppWinRT EP_CppWinRT)
+target_link_libraries(ThirdParty-CppWinRT INTERFACE "WindowsApp")
+target_include_directories(ThirdParty-CppWinRT INTERFACE "${BINARY_DIR}/include")