From 9f808376b9a9215b0ae8359f5164f384bd192a03 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Sun, 5 Sep 2021 00:43:55 +0300 Subject: [PATCH] Update PocoMacros.cmake --- vendor/POCO/cmake/PocoMacros.cmake | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/vendor/POCO/cmake/PocoMacros.cmake b/vendor/POCO/cmake/PocoMacros.cmake index 71c62aba..00213f18 100644 --- a/vendor/POCO/cmake/PocoMacros.cmake +++ b/vendor/POCO/cmake/PocoMacros.cmake @@ -39,21 +39,21 @@ if(WIN32) endif() endforeach() endif(X64) - endif() - find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir} + find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir} + DOC "path to message compiler") + elseif ("${CMAKE_GENERATOR}" MATCHES "MSYS" OR "${CMAKE_GENERATOR}" MATCHES "^(CodeBlocks)?.*(MinGW)?.*") + get_filename_component(MINGW_BIN_PATH ${CMAKE_C_COMPILER} DIRECTORY REALPATH) + if(NOT IS_DIRECTORY ${MINGW_BIN_PATH}) + get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} DIRECTORY REALPATH) + endif() + find_program(CMAKE_MC_COMPILER windmc.exe HINTS "${MINGW_BIN_PATH}" DOC "path to message compiler") -elseif ("${CMAKE_GENERATOR}" MATCHES "MSYS" OR "${CMAKE_GENERATOR}" MATCHES "^(CodeBlocks)?.*(MinGW)?.*") - get_filename_component(MINGW_BIN_PATH ${CMAKE_C_COMPILER} DIRECTORY REALPATH) - if(NOT IS_DIRECTORY ${MINGW_BIN_PATH}) - get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} DIRECTORY REALPATH) endif() - find_program(CMAKE_MC_COMPILER windmc.exe HINTS "${MINGW_BIN_PATH}" - DOC "path to message compiler") - if(NOT CMAKE_MC_COMPILER) - message(FATAL_ERROR "message compiler not found: required to build") - endif(NOT CMAKE_MC_COMPILER) - message(STATUS "Found message compiler: ${CMAKE_MC_COMPILER}") - mark_as_advanced(CMAKE_MC_COMPILER) + if(NOT CMAKE_MC_COMPILER) + message(FATAL_ERROR "message compiler not found: required to build") + endif(NOT CMAKE_MC_COMPILER) + message(STATUS "Found message compiler: ${CMAKE_MC_COMPILER}") + mark_as_advanced(CMAKE_MC_COMPILER) endif(WIN32) #===============================================================================