Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nanopb/nanopb.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Müller <Tobias_Mueller@twam.info>2023-08-11 09:00:24 +0300
committerPetteri Aimonen <jpa@github.mail.kapsi.fi>2023-08-11 10:17:36 +0300
commit4ea09e8adcbd27e04f818117e88365e288ab8837 (patch)
treedb26ad548d8fe6f1ff4755f7e95486a1a665f202
parent8ef41e0ebd45daaf19459a011f67e66224b247cd (diff)
Fix first path passed to protoc
Fix relative path passed to protoc when using RELPATH but NANOPB_GENERATE_CPP_APPEND_PATH not set. In this case the path provided by RELPATH should be passed to protoc first instead of the current source directory. This was working before and broke with 8cc860c. Co-authored-by: Guillaume Lager <g.lager@innoseis.com>
-rw-r--r--extra/FindNanopb.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/FindNanopb.cmake b/extra/FindNanopb.cmake
index e6b5591..c832896 100644
--- a/extra/FindNanopb.cmake
+++ b/extra/FindNanopb.cmake
@@ -144,7 +144,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
list(APPEND _nanopb_include_path "-I${ABS_PATH}")
endforeach()
else()
- set(_nanopb_include_path "-I${CMAKE_CURRENT_SOURCE_DIR}")
+ list(APPEND _nanopb_include_path "-I${CMAKE_CURRENT_SOURCE_DIR}")
endif()
if(DEFINED NANOPB_IMPORT_DIRS)