mirror of
https://github.com/pocoproject/poco.git
synced 2025-07-03 17:17:12 +02:00
Merge pull request #939 from siemens/mc-compiler
CMake: Add additional registry entry to find mc.exe
This commit is contained in:
commit
b1bcd786b0
@ -16,15 +16,18 @@ if (WIN32)
|
|||||||
# be set up anyway
|
# be set up anyway
|
||||||
get_filename_component(sdk_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" REALPATH)
|
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)
|
get_filename_component(kit_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot]" REALPATH)
|
||||||
|
get_filename_component(kit81_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot81]" REALPATH)
|
||||||
if (X64)
|
if (X64)
|
||||||
set(sdk_bindir "${sdk_dir}/bin/x64")
|
set(sdk_bindir "${sdk_dir}/bin/x64")
|
||||||
set(kit_bindir "${kit_dir}/bin/x64")
|
set(kit_bindir "${kit_dir}/bin/x64")
|
||||||
|
set(kit81_bindir "${kit81_dir}/bin/x64")
|
||||||
else (X64)
|
else (X64)
|
||||||
set(sdk_bindir "${sdk_dir}/bin")
|
set(sdk_bindir "${sdk_dir}/bin")
|
||||||
set(kit_bindir "${kit_dir}/bin/x86")
|
set(kit_bindir "${kit_dir}/bin/x86")
|
||||||
|
set(kit81_bindir "${kit81_dir}/bin/x86")
|
||||||
endif (X64)
|
endif (X64)
|
||||||
endif ()
|
endif ()
|
||||||
find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}"
|
find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}"
|
||||||
DOC "path to message compiler")
|
DOC "path to message compiler")
|
||||||
if (NOT CMAKE_MC_COMPILER)
|
if (NOT CMAKE_MC_COMPILER)
|
||||||
message(FATAL_ERROR "message compiler not found: required to build")
|
message(FATAL_ERROR "message compiler not found: required to build")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user