mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-16 04:05:46 +00:00
Code Issues Releases Wiki Activity

Add some fixes to CMake scripts

Browse Source
This commit is contained in:
Carles Fernandez 2019-02-04 23:26:07 +01:00
parent 708b288e61
commit ce83462f85
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/CMakeLists.txt
View File

@ -33,6 +33,7 @@ target_link_libraries(gnss-sdr
Glog::glog Glog::glog
gnss_rx gnss_rx
gnss_sdr_flags gnss_sdr_flags
${THREAD_LIBRARIES}
${MAC_LIBRARIES} ${MAC_LIBRARIES}
) )

14
src/utils/rinex2assist/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -24,7 +24,6 @@ if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include) set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include)
endif() endif()
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk)
find_package(Boost COMPONENTS iostreams serialization QUIET) find_package(Boost COMPONENTS iostreams serialization QUIET)
if(CMAKE_VERSION VERSION_LESS 3.5) if(CMAKE_VERSION VERSION_LESS 3.5)
@ -56,11 +55,6 @@ find_program(UNCOMPRESS_EXECUTABLE uncompress
) )
if(Boost_FOUND) if(Boost_FOUND)
include_directories(
${GPSTK_INCLUDE_DIR}/gpstk
${GPSTK_INCLUDE_DIR}
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
add_executable(rinex2assist ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) add_executable(rinex2assist ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
@ -76,6 +70,12 @@ if(Boost_FOUND)
gnss_rx gnss_rx
) )
target_include_directories(rinex2assist
PUBLIC
${GPSTK_INCLUDE_DIR}/gpstk
${GPSTK_INCLUDE_DIR}
)
if(NOT UNCOMPRESS_EXECUTABLE-NOTFOUND) if(NOT UNCOMPRESS_EXECUTABLE-NOTFOUND)
target_compile_definitions(rinex2assist PUBLIC -DUNCOMPRESS_EXECUTABLE="${UNCOMPRESS_EXECUTABLE}") target_compile_definitions(rinex2assist PUBLIC -DUNCOMPRESS_EXECUTABLE="${UNCOMPRESS_EXECUTABLE}")
else() else()