From 5a3bd898e492255926333fcc585a618bbfc0e5c3 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Wed, 10 May 2023 22:02:05 +0200 Subject: add "call" under Windows upon generator call --- extra/FindNanopb.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/extra/FindNanopb.cmake b/extra/FindNanopb.cmake index 928c012..e6b5591 100644 --- a/extra/FindNanopb.cmake +++ b/extra/FindNanopb.cmake @@ -126,6 +126,10 @@ function(NANOPB_GENERATE_CPP SRCS HDRS) return() endif() set(NANOPB_OPTIONS_DIRS) + + if(MSVC) + set(CUSTOM_COMMAND_PREFIX call) + endif() if(NANOPB_GENERATE_CPP_RELPATH) list(APPEND _nanopb_include_path "-I${NANOPB_GENERATE_CPP_RELPATH}") @@ -190,7 +194,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS) set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output}) add_custom_command( OUTPUT ${output} - COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} + COMMAND ${CUSTOM_COMMAND_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE} ARGS -I${GENERATOR_PATH}/proto --python_out=${GENERATOR_CORE_DIR} ${ABS_FIL} DEPENDS ${ABS_FIL} @@ -272,7 +276,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c" "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h" - COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} + COMMAND ${CUSTOM_COMMAND_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE} ARGS ${_nanopb_include_path} -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} --plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN} @@ -291,6 +295,10 @@ function(NANOPB_GENERATE_CPP SRCS HDRS) if(NOT DEFINED NANOPB_GENERATE_CPP_STANDALONE) set(NANOPB_GENERATE_CPP_STANDALONE TRUE) endif() + + if(MSVC) + unset(CUSTOM_COMMAND_PREFIX) + endif() if (NANOPB_GENERATE_CPP_STANDALONE) set(${SRCS} ${${SRCS}} ${NANOPB_SRCS} PARENT_SCOPE) -- cgit v1.2.3