mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-08-01 16:52:54 +00:00
Workaround for OpenSUSE/Leap
This commit is contained in:
parent
b99e431f8b
commit
14da62a0ad
@ -371,8 +371,8 @@ if(CMAKE_VERSION VERSION_LESS "3.4")
|
|||||||
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
|
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CROSSCOMPILING OR CMAKE_VERSION VERSION_LESS "3.13"
|
if(CMAKE_CROSSCOMPILING OR CMAKE_VERSION VERSION_LESS "3.13" OR
|
||||||
OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0.0))
|
(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0.0))
|
||||||
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12")
|
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -2792,8 +2792,8 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI
|
|||||||
|
|
||||||
if(NOT TARGET protobuf::protoc)
|
if(NOT TARGET protobuf::protoc)
|
||||||
add_executable(protobuf::protoc IMPORTED)
|
add_executable(protobuf::protoc IMPORTED)
|
||||||
add_dependencies(protobuf::protoc protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION})
|
|
||||||
endif()
|
endif()
|
||||||
|
add_dependencies(protobuf::protoc protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION})
|
||||||
unset(Protobuf_PROTOC_EXECUTABLE)
|
unset(Protobuf_PROTOC_EXECUTABLE)
|
||||||
set(PROTOBUF_PROTOC_EXECUTABLE "${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/bin/protoc")
|
set(PROTOBUF_PROTOC_EXECUTABLE "${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/bin/protoc")
|
||||||
set_target_properties(protobuf::protoc PROPERTIES
|
set_target_properties(protobuf::protoc PROPERTIES
|
||||||
|
Loading…
x
Reference in New Issue
Block a user