From ebd7fcd92126ee28cf5778c8f6b7bda81fcb0342 Mon Sep 17 00:00:00 2001 From: Mark Schofield Date: Thu, 8 Jun 2023 22:39:25 -0700 Subject: [PATCH] Replace include_directories by CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES --- Windows.Kits.cmake | 13 ++++++++----- Windows.MSVC.toolchain.cmake | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Windows.Kits.cmake b/Windows.Kits.cmake index 4390488..8b6ba66 100644 --- a/Windows.Kits.cmake +++ b/Windows.Kits.cmake @@ -129,11 +129,14 @@ else() message(FATAL_ERROR "Unable identify Windows Kits architecture for CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}") endif() -include_directories(SYSTEM "${WINDOWS_KITS_INCLUDE_PATH}/ucrt") -include_directories(SYSTEM "${WINDOWS_KITS_INCLUDE_PATH}/shared") -include_directories(SYSTEM "${WINDOWS_KITS_INCLUDE_PATH}/um") -include_directories(SYSTEM "${WINDOWS_KITS_INCLUDE_PATH}/winrt") -include_directories(SYSTEM "${WINDOWS_KITS_INCLUDE_PATH}/cppwinrt") +foreach(LANG C CXX RC) + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${WINDOWS_KITS_INCLUDE_PATH}/ucrt") + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${WINDOWS_KITS_INCLUDE_PATH}/shared") + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${WINDOWS_KITS_INCLUDE_PATH}/um") + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${WINDOWS_KITS_INCLUDE_PATH}/winrt") + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${WINDOWS_KITS_INCLUDE_PATH}/cppwinrt") +endforeach() + link_directories("${WINDOWS_KITS_LIB_PATH}/ucrt/${WINDOWS_KITS_TARGET_ARCHITECTURE}") link_directories("${WINDOWS_KITS_LIB_PATH}/um/${WINDOWS_KITS_TARGET_ARCHITECTURE}") link_directories("${WINDOWS_KITS_REFERENCES_PATH}/${WINDOWS_KITS_TARGET_ARCHITECTURE}") diff --git a/Windows.MSVC.toolchain.cmake b/Windows.MSVC.toolchain.cmake index fc79b9b..9c86987 100644 --- a/Windows.MSVC.toolchain.cmake +++ b/Windows.MSVC.toolchain.cmake @@ -183,8 +183,10 @@ if(NOT MSVC_VERSION) endif() # Compiler -include_directories(SYSTEM "${VS_TOOLSET_PATH}/ATLMFC/include") -include_directories(SYSTEM "${VS_TOOLSET_PATH}/include") +foreach(LANG C CXX RC) + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${VS_TOOLSET_PATH}/ATLMFC/include") + list(APPEND CMAKE_${LANG}_STANDARD_INCLUDE_DIRECTORIES "${VS_TOOLSET_PATH}/include") +endforeach() if(VS_USE_SPECTRE_MITIGATION_RUNTIME) set(TOOLCHAIN_SPECTRE_TOKEN "/spectre")