mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-05 22:59:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindProtobuf: Fix protoc include path regression

Browse Source 
This was accidentally broken by commit 31adc11030 (FindProtobuf: Add
PLUGIN_OPTIONS and PROTOC_OPTIONS to protobuf_generate, 2023-06-29,
v3.28.0-rc1~409^2~2).

Fixes: #25368
This commit is contained in:
André Apitzsch
2023-10-27 17:12:46 +02:00
committed by Brad King
parent e3747a2d4b
commit d7f7bf08cd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindProtobuf.cmake
View File

@@ -299,6 +299,8 @@ function(protobuf_generate)
list(APPEND _protobuf_include_path -I ${_abs_dir}) list(APPEND _protobuf_include_path -I ${_abs_dir})
endif() endif()
endforeach() endforeach()
else()
set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
endif() endif()
foreach(DIR ${protobuf_generate_IMPORT_DIRS}) foreach(DIR ${protobuf_generate_IMPORT_DIRS})
@@ -309,10 +311,6 @@ function(protobuf_generate)
endif() endif()
endforeach() endforeach()
if(NOT _protobuf_include_path)
set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
endif()
set(_generated_srcs_all) set(_generated_srcs_all)
foreach(_proto ${protobuf_generate_PROTOS}) foreach(_proto ${protobuf_generate_PROTOS})
get_filename_component(_abs_file ${_proto} ABSOLUTE) get_filename_component(_abs_file ${_proto} ABSOLUTE)