mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-29 18:34:51 +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-10-10 20:49:50 +02:00
commit c7c5e85297
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -1233,9 +1233,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
set(GLOG_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) set(GLOG_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(GLOG_MAKE_PROGRAM MATCHES "ninja") if(GLOG_MAKE_PROGRAM MATCHES "ninja")
find_program(GLOG_MAKE_EXECUTABLE make find_program(GLOG_MAKE_EXECUTABLE make
HINTS PATHS
/usr/bin/ /usr/bin
/usr/local/bin/ /usr/local/bin
) )
if(NOT GLOG_MAKE_EXECUTABLE) if(NOT GLOG_MAKE_EXECUTABLE)
message(FATAL_ERROR "make is required to build Glog from source.") message(FATAL_ERROR "make is required to build Glog from source.")
@ -1683,9 +1683,9 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
set(MATIO_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) set(MATIO_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(MATIO_MAKE_PROGRAM MATCHES "ninja") if(MATIO_MAKE_PROGRAM MATCHES "ninja")
find_program(MATIO_MAKE_EXECUTABLE make find_program(MATIO_MAKE_EXECUTABLE make
HINTS PATHS
/usr/bin/ /usr/bin
/usr/local/bin/ /usr/local/bin
) )
if(NOT MATIO_MAKE_EXECUTABLE) if(NOT MATIO_MAKE_EXECUTABLE)
message(FATAL_ERROR "make is required to build Matio from source.") message(FATAL_ERROR "make is required to build Matio from source.")
@ -1886,9 +1886,9 @@ if(Protobuf_FOUND AND CMAKE_CROSSCOMPILING)
find_program(PROTOC_EXECUTABLE protoc) find_program(PROTOC_EXECUTABLE protoc)
if(NOT PROTOC_EXECUTABLE) if(NOT PROTOC_EXECUTABLE)
find_program(PROTOC_EXECUTABLE protoc find_program(PROTOC_EXECUTABLE protoc
HINTS PATHS
/usr/bin/ /usr/bin
/usr/local/bin/ /usr/local/bin
) )
endif() endif()
if(PROTOC_EXECUTABLE) if(PROTOC_EXECUTABLE)
@ -1959,9 +1959,9 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI
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
HINTS PATHS
/usr/bin/ /usr/bin
/usr/local/bin/ /usr/local/bin
) )
if(NOT MAKE_EXECUTABLE) if(NOT MAKE_EXECUTABLE)
message(FATAL_ERROR "make is required to build Protocol Buffers from source.") message(FATAL_ERROR "make is required to build Protocol Buffers from source.")