mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-28 18:04: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-09-07 13:37:42 +02:00
commit 006fb047c0
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -764,7 +764,18 @@ if(CMAKE_VERSION VERSION_LESS 3.5)
endif() endif()
if(CMAKE_VERSION VERSION_LESS 3.15) if(CMAKE_VERSION VERSION_LESS 3.15)
if(NOT TARGET Boost::headers) if(NOT TARGET Boost::headers)
add_library(Boost::headers ALIAS Boost::boost) if(CMAKE_VERSION VERSION_LESS 3.0)
add_library(Boost::boost SHARED IMPORTED) # Trick for CMake 2.8.12
set_target_properties(Boost::boost PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}
IMPORTED_LOCATION ${Boost_DATE_TIME_LIBRARIES}
)
else()
add_library(Boost::headers INTERFACE IMPORTED)
set_target_properties(Boost::filesystem PROPERTIES
Boost::headers ${Boost_INCLUDE_DIR}
)
endif()
endif() endif()
endif() endif()

61
src/main/CMakeLists.txt
View File

@ -95,17 +95,29 @@ add_custom_command(TARGET gnss-sdr
install(TARGETS gnss-sdr install(TARGETS gnss-sdr
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
COMPONENT "gnss-sdr") COMPONENT "gnss-sdr"
)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf
FILES_MATCHING PATTERN "*.conf") DESTINATION share/gnss-sdr
FILES_MATCHING PATTERN "*.conf"
)
install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION share/gnss-sdr/conf install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf
RENAME default.conf) DESTINATION share/gnss-sdr/conf
RENAME default.conf
)
if(NOT VOLKGNSSSDR_FOUND) if(NOT VOLKGNSSSDR_FOUND)
install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile DESTINATION bin COMPONENT "volk_gnsssdr") install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile
install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr-config-info DESTINATION bin COMPONENT "volk_gnsssdr") DESTINATION bin
COMPONENT "volk_gnsssdr"
)
install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr-config-info
DESTINATION bin
COMPONENT "volk_gnsssdr"
)
endif() endif()
find_program(GZIP find_program(GZIP
@ -119,21 +131,40 @@ find_program(GZIP
if(NOT GZIP_NOTFOUND) if(NOT GZIP_NOTFOUND)
execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/gnss-sdr-manpage execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/gnss-sdr-manpage
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/gnss-sdr.1.gz") WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
OUTPUT_FILE "${CMAKE_BINARY_DIR}/gnss-sdr.1.gz"
)
install(FILES ${CMAKE_BINARY_DIR}/gnss-sdr.1.gz DESTINATION share/man/man1) install(FILES ${CMAKE_BINARY_DIR}/gnss-sdr.1.gz
DESTINATION share/man/man1
)
execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/changelog execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/changelog
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz") WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz"
)
install(FILES ${CMAKE_BINARY_DIR}/changelog.gz DESTINATION share/doc/gnss-sdr) install(FILES ${CMAKE_BINARY_DIR}/changelog.gz
DESTINATION share/doc/gnss-sdr
)
if(NOT VOLKGNSSSDR_FOUND) if(NOT VOLKGNSSSDR_FOUND)
execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz") WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz"
)
execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz") WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz DESTINATION share/man/man1) OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz"
install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz DESTINATION share/man/man1) )
install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz
DESTINATION share/man/man1
)
install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz
DESTINATION share/man/man1
)
endif() endif()
endif() endif()