From fe42933ac50a985a3f49d93529d8f15293a7b91d Mon Sep 17 00:00:00 2001 From: huihut Date: Wed, 4 Sep 2019 23:36:56 +0800 Subject: [PATCH] Merge pull request #15433 from huihut:master * fix 'chmod' is not recognized as an internal or external command in Windows https://github.com/opencv/opencv/issues/14939 * cmake: update PCH command handling --- cmake/OpenCVPCHSupport.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index b36fa78ccd..a796ae9faa 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -305,10 +305,13 @@ fi ${_command} '-D$,' '-D>' ") GET_FILENAME_COMPONENT(_outdir ${_output} PATH) + if(NOT CMAKE_HOST_WIN32) # chmod may be not available on Win32/MinGW (and it is not required) + set(_pch_prepare_command COMMAND chmod +x "${_pch_generate_file_cmd}") + endif() ADD_CUSTOM_COMMAND( OUTPUT "${_output}" COMMAND ${CMAKE_COMMAND} -E make_directory "${_outdir}" - COMMAND chmod +x "${_pch_generate_file_cmd}" + ${_pch_prepare_command} COMMAND "${_pch_generate_file_cmd}" DEPENDS "${_input}" "${_pch_generate_file_cmd}" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_name}"