mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-15 01:29:58 +00:00
Code Issues Releases Wiki Activity

Allow building Matio and Protobuf with Xcode

Browse Source
This commit is contained in:
Carles Fernandez 2020-02-03 08:10:34 +01:00
parent ef5b392093
commit a5fe0dab5c
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1773,7 +1773,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
endif() endif()
set(MATIO_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}) set(MATIO_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(MATIO_MAKE_PROGRAM MATCHES "ninja") if(PROTOBUF_MAKE_PROGRAM MATCHES "ninja" OR CMAKE_GENERATOR STREQUAL Xcode)
find_program(MATIO_MAKE_EXECUTABLE make find_program(MATIO_MAKE_EXECUTABLE make
PATHS PATHS
/usr/bin /usr/bin
@ -2092,7 +2092,7 @@ if((NOT Protobuf_FOUND) OR (NOT Protobuf_PROTOC_EXECUTABLE) OR (${Protobuf_VERSI
endif() endif()
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" OR CMAKE_GENERATOR STREQUAL Xcode)
find_program(MAKE_EXECUTABLE make find_program(MAKE_EXECUTABLE make
PATHS PATHS
/usr/bin /usr/bin