mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +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-06-19 07:35:21 +02:00
commit b4cb8732b9
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -673,7 +673,7 @@ if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
if(POLICY CMP0057) if(POLICY CMP0057)
cmake_policy(SET CMP0057 NEW) cmake_policy(SET CMP0057 NEW)
endif() endif()
if(NOT ENABLE_UNIT_TESTING_EXTRA) # Workaround for GPSTk if((NOT ENABLE_UNIT_TESTING_EXTRA) AND (NOT ENABLE_SYSTEM_TESTING_EXTRA) AND (NOT ENABLE_FPGA)) # Workaround for GPSTk
find_package(FILESYSTEM COMPONENTS Final Experimental) find_package(FILESYSTEM COMPONENTS Final Experimental)
set_package_properties(FILESYSTEM PROPERTIES set_package_properties(FILESYSTEM PROPERTIES
URL "https://en.cppreference.com/w/cpp/filesystem" URL "https://en.cppreference.com/w/cpp/filesystem"

4
cmake/Modules/FindPCAP.cmake
View File

@ -92,13 +92,13 @@ set(PCAP_LIBRARIES ${PCAP_LIBRARY})
if(PCAP_INCLUDE_DIRS) if(PCAP_INCLUDE_DIRS)
message(STATUS "Pcap include dirs set to ${PCAP_INCLUDE_DIRS}") message(STATUS "Pcap include dirs set to ${PCAP_INCLUDE_DIRS}")
else() else()
message(FATAL " Pcap include dirs cannot be found") message(STATUS "Pcap include dirs cannot be found.")
endif() endif()
if(PCAP_LIBRARIES) if(PCAP_LIBRARIES)
message(STATUS "Pcap library set to ${PCAP_LIBRARIES}") message(STATUS "Pcap library set to ${PCAP_LIBRARIES}")
else() else()
message(FATAL "Pcap library cannot be found") message(STATUS "Pcap library cannot be found.")
endif() endif()
#Functions #Functions