mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-09 19:40:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-04-24 01:30:39 +02:00
commit 76bf09dc32
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1940,13 +1940,7 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI
message(FATAL_ERROR "aclocal is required to build Protocol Buffers from source") message(FATAL_ERROR "aclocal is required to build Protocol Buffers from source")
endif() endif()
endif() endif()
find_package(CURL REQUIRED)
set_package_properties(CURL PROPERTIES
URL "https://curl.haxx.se/"
DESCRIPTION "Command line tool and library for transferring data with URLs"
PURPOSE "Required to build Protocol Buffers."
TYPE REQUIRED
)
set(PROTOBUF_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) set(PROTOBUF_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja") if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja")
find_program(MAKE_EXECUTABLE make find_program(MAKE_EXECUTABLE make