From a7247c7d75e55d80160f1a8f31f149e32e561bb9 Mon Sep 17 00:00:00 2001 From: Meier Roger meierro Date: Mon, 16 Jun 2014 11:22:47 +0200 Subject: [PATCH] CMakeLists.txt: use Windows Kit as alternative for message compiler --- Foundation/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index b9f07530a..2c3e3acf4 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -6,13 +6,16 @@ if (WIN32) # this path is only present for 2008+, but we currently require PATH to # be set up anyway get_filename_component(sdk_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" REALPATH) + get_filename_component(kit_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot]" REALPATH) if (X64) set(sdk_bindir "${sdk_dir}/bin/x64") + set(kit_bindir "${kit_dir}/bin/x64") else (X64) set(sdk_bindir "${sdk_dir}/bin") + set(kit_bindir "${kit_dir}/bin/x86") endif (X64) endif () - find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" + find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" DOC "path to message compiler") if (NOT CMAKE_MC_COMPILER) message(FATAL_ERROR "message compiler not found: required to build")