mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Get rid of deprecated link_libraries()

This commit is contained in:
Carles Fernandez 2018-11-17 19:26:06 +01:00
parent bec3775f23
commit 30d162c76a
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -433,7 +433,7 @@ endif(NOT ENABLE_GENERIC_ARCH)
################################################################################
if(CMAKE_VERSION VERSION_LESS 3.1)
find_package(Threads REQUIRED)
link_libraries(${CMAKE_THREAD_LIBS_INIT})
set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
else(CMAKE_VERSION VERSION_LESS 3.1)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
if(CMAKE_CROSSCOMPILING)
@ -442,7 +442,7 @@ else(CMAKE_VERSION VERSION_LESS 3.1)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
endif(CMAKE_CROSSCOMPILING)
find_package(Threads REQUIRED)
link_libraries(Threads::Threads)
set(THREAD_LIBRARIES Threads::Threads)
endif(CMAKE_VERSION VERSION_LESS 3.1)

1
src/main/CMakeLists.txt
View File

@ -82,6 +82,7 @@ add_custom_command(TARGET gnss-sdr POST_BUILD
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr> )
target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
${THREAD_LIBRARIES}
${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}

9
src/tests/CMakeLists.txt
View File

@ -95,7 +95,7 @@ if(NOT ${GTEST_DIR_LOCAL})
set(GTEST_LIBRARIES
${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
)
${THREAD_LIBRARIES} )
set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
else(NOT ${GTEST_DIR_LOCAL})
if(GTEST_INCLUDE_DIRS)
@ -109,6 +109,7 @@ else(NOT ${GTEST_DIR_LOCAL})
add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
set(GTEST_LIBRARIES gtest)
endif(GTEST_INCLUDE_DIRS)
target_link_libraries(gtest ${THREAD_LIBRARIES})
endif(NOT ${GTEST_DIR_LOCAL})
@ -495,6 +496,7 @@ if(ENABLE_SYSTEM_TESTING)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(HOST_SYSTEM "GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCH_}")
string(REPLACE "\n" "" HOST_SYSTEM "${HOST_SYSTEM}")
string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(HOST_SYSTEM "MacOS")
@ -502,7 +504,7 @@ if(ENABLE_SYSTEM_TESTING)
add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
#### TTFF
set(OPT_LIBS_ ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES} ${GTEST_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs
@ -512,7 +514,7 @@ if(ENABLE_SYSTEM_TESTING)
if(ENABLE_SYSTEM_TESTING_EXTRA)
#### POSITION_TEST
set(OPT_LIBS_ ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
${GTEST_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
${GNURADIO_ANALOG_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES}
@ -601,6 +603,7 @@ if(NOT ${GTEST_DIR_LOCAL})
else(NOT ${GTEST_DIR_LOCAL})
add_dependencies(gnss_block_test gtest)
endif(NOT ${GTEST_DIR_LOCAL})
set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
#########################################################

3
src/utils/front-end-cal/CMakeLists.txt
View File

@ -32,7 +32,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/core/libs
${CMAKE_SOURCE_DIR}/src/core/libs/supl
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
@ -51,6 +51,7 @@ add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
${THREAD_LIBRARIES}
${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}