mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve detecton of Protocol Buffers compiler when cross-compiling

This commit is contained in:
Carles Fernandez 2019-04-30 20:22:10 +02:00
parent 16f9e623c1
commit 01ea7ed831
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -1871,19 +1871,22 @@ if(Protobuf_FOUND AND CMAKE_VERSION VERSION_LESS 3.9)
endif() endif()
endif() endif()
if(Protobuf_FOUND AND CMAKE_CROSSCOMPILING) if(Protobuf_FOUND AND CMAKE_CROSSCOMPILING)
find_program(PROTOC_EXECUTABLE protoc find_program(PROTOC_EXECUTABLE protoc)
HINTS if(NOT PROTOC_EXECUTABLE)
/usr/local/bin/ find_program(PROTOC_EXECUTABLE protoc
/usr/bin/ HINTS
NO_SYSTEM_ENVIRONMENT_PATH /usr/bin/
) /usr/local/bin/
)
endif()
if(PROTOC_EXECUTABLE) if(PROTOC_EXECUTABLE)
set_target_properties(protobuf::protoc PROPERTIES set_target_properties(protobuf::protoc PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
IMPORTED_LOCATION ${PROTOC_EXECUTABLE} IMPORTED_LOCATION ${PROTOC_EXECUTABLE}
) )
set(Protobuf_PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE})
else() else()
message(FATAL ERROR "Please install the Protocol Buffers compiter v${Protobuf_VERSION} in the host machine") message(FATAL_ERROR "Please install the Protocol Buffers compiler v${Protobuf_VERSION} in the host machine")
endif() endif()
endif() endif()
if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSION} VERSION_LESS ${GNSSSDR_PROTOBUF_MIN_VERSION})) if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSION} VERSION_LESS ${GNSSSDR_PROTOBUF_MIN_VERSION}))