mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 11:40:33 +00:00
Code Issues Releases Wiki Activity

Remove duplicate libraries warning emitted by Xcode 15

Browse Source
This commit is contained in:
Carles Fernandez 2024-04-13 09:03:46 +02:00
parent fc695cb6f6
commit fd5174e7ec
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
8 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/XcodeDeleteDuplicates.cmake → cmake/Modules/XcodeRemoveWarningDuplicates.cmake
View File

@ -4,12 +4,12 @@
# SPDX-FileCopyrightText: 2011-2024 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-FileCopyrightText: 2011-2024 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if(DEFINED __INCLUDED_XCODE_DELETE_DUPLICATES_CMAKE) if(DEFINED __INCLUDED_XCODE_REMOVE_WARNING_DUPLICATES_CMAKE)
return() return()
endif() endif()
set(__INCLUDED_XCODE_DELETE_DUPLICATES_CMAKE TRUE) set(__INCLUDED_XCODE_REMOVE_WARNING_DUPLICATES_CMAKE TRUE)
function(xcode_delete_duplicates target) function(xcode_remove_warning_duplicates target)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0") if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0")
# A bug in Xcode 15 adds duplicate flags to the linker. In addition, the # A bug in Xcode 15 adds duplicate flags to the linker. In addition, the

6
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
View File

@ -77,8 +77,8 @@ if(UNIX)
) )
endif() endif()
include(XcodeDeleteDuplicates) include(XcodeRemoveWarningDuplicates)
xcode_delete_duplicates(volk_gnsssdr_profile) xcode_remove_warning_duplicates(volk_gnsssdr_profile)
if(ENABLE_STRIP) if(ENABLE_STRIP)
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
@ -109,7 +109,7 @@ if(UNIX)
) )
endif() endif()
xcode_delete_duplicates(volk_gnsssdr-config-info) xcode_remove_warning_duplicates(volk_gnsssdr-config-info)
if(ENABLE_STRIP) if(ENABLE_STRIP)
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)

6
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/XcodeDeleteDuplicates.cmake → src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/XcodeRemoveWarningDuplicates.cmake
View File

@ -4,12 +4,12 @@
# SPDX-FileCopyrightText: 2011-2024 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-FileCopyrightText: 2011-2024 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if(DEFINED __INCLUDED_XCODE_DELETE_DUPLICATES_CMAKE) if(DEFINED __INCLUDED_XCODE_REMOVE_WARNING_DUPLICATES_CMAKE)
return() return()
endif() endif()
set(__INCLUDED_XCODE_DELETE_DUPLICATES_CMAKE TRUE) set(__INCLUDED_XCODE_REMOVE_WARNING_DUPLICATES_CMAKE TRUE)
function(xcode_delete_duplicates target) function(xcode_remove_warning_duplicates target)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0") if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0")
# A bug in Xcode 15 adds duplicate flags to the linker. In addition, the # A bug in Xcode 15 adds duplicate flags to the linker. In addition, the

8
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
View File

@ -4,7 +4,7 @@
# SPDX-FileCopyrightText: 2010-2021 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-FileCopyrightText: 2010-2021 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
include(XcodeDeleteDuplicates) include(XcodeRemoveWarningDuplicates)
######################################################################## ########################################################################
# header file detection # header file detection
@ -597,7 +597,7 @@ if(NOT (ENABLE_STATIC_LIBS AND (CMAKE_GENERATOR STREQUAL Xcode)))
target_link_libraries(volk_gnsssdr PUBLIC ${volk_gnsssdr_libraries}) target_link_libraries(volk_gnsssdr PUBLIC ${volk_gnsssdr_libraries})
endif() endif()
xcode_delete_duplicates(volk_gnsssdr) xcode_remove_warning_duplicates(volk_gnsssdr)
target_include_directories(volk_gnsssdr target_include_directories(volk_gnsssdr
PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
@ -680,7 +680,7 @@ if(ENABLE_STATIC_LIBS)
) )
set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr) set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)
xcode_delete_duplicates(volk_gnsssdr_static) xcode_remove_warning_duplicates(volk_gnsssdr_static)
install(TARGETS volk_gnsssdr_static install(TARGETS volk_gnsssdr_static
EXPORT VOLK_GNSSSDR-export EXPORT VOLK_GNSSSDR-export
@ -709,7 +709,7 @@ if(ENABLE_TESTING)
) )
endif() endif()
xcode_delete_duplicates(volk_gnsssdr_test_all) xcode_remove_warning_duplicates(volk_gnsssdr_test_all)
foreach(kernel ${h_files}) foreach(kernel ${h_files})
get_filename_component(kernel ${kernel} NAME) get_filename_component(kernel ${kernel} NAME)

4
src/main/CMakeLists.txt
View File

@ -65,8 +65,8 @@ if(ENABLE_STRIP)
set_target_properties(gnss-sdr PROPERTIES LINK_FLAGS "-s") set_target_properties(gnss-sdr PROPERTIES LINK_FLAGS "-s")
endif() endif()
include(XcodeDeleteDuplicates) include(XcodeRemoveWarningDuplicates)
xcode_delete_duplicates(gnss-sdr) xcode_remove_warning_duplicates(gnss-sdr)
if(ENABLE_CLANG_TIDY) if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE) if(CLANG_TIDY_EXE)

20
src/tests/CMakeLists.txt
View File

@ -8,7 +8,7 @@
add_subdirectory(unit-tests/signal-processing-blocks/libs) add_subdirectory(unit-tests/signal-processing-blocks/libs)
add_subdirectory(system-tests/libs) add_subdirectory(system-tests/libs)
include(XcodeDeleteDuplicates) include(XcodeRemoveWarningDuplicates)
################################################################################ ################################################################################
# Google Test - https://github.com/google/googletest # Google Test - https://github.com/google/googletest
@ -647,7 +647,7 @@ if(ENABLE_UNIT_TESTING)
target_compile_definitions(run_tests PRIVATE -DGNSSTK_OLDER_THAN_9=1) target_compile_definitions(run_tests PRIVATE -DGNSSTK_OLDER_THAN_9=1)
endif() endif()
endif() endif()
xcode_delete_duplicates(run_tests) xcode_remove_warning_duplicates(run_tests)
if(ENABLE_STRIP) if(ENABLE_STRIP)
set_target_properties(run_tests PROPERTIES LINK_FLAGS "-s") set_target_properties(run_tests PROPERTIES LINK_FLAGS "-s")
endif() endif()
@ -827,7 +827,7 @@ function(add_system_test executable)
) )
endif() endif()
xcode_delete_duplicates(${executable}) xcode_remove_warning_duplicates(${executable})
if(ENABLE_CLANG_TIDY) if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE) if(CLANG_TIDY_EXE)
@ -944,7 +944,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
${GNSSSDR_SOURCE_DIR}/src/algorithms/libs ${GNSSSDR_SOURCE_DIR}/src/algorithms/libs
) )
xcode_delete_duplicates(flowgraph_test) xcode_remove_warning_duplicates(flowgraph_test)
add_test(flowgraph_test flowgraph_test) add_test(flowgraph_test flowgraph_test)
@ -1001,7 +1001,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
target_compile_definitions(gnss_block_test PRIVATE -DENABLE_FPGA=1) target_compile_definitions(gnss_block_test PRIVATE -DENABLE_FPGA=1)
endif() endif()
xcode_delete_duplicates(gnss_block_test) xcode_remove_warning_duplicates(gnss_block_test)
add_test(gnss_block_test gnss_block_test) add_test(gnss_block_test gnss_block_test)
@ -1040,7 +1040,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
algorithms_libs algorithms_libs
) )
xcode_delete_duplicates(gnuradio_block_test) xcode_remove_warning_duplicates(gnuradio_block_test)
add_test(gnuradio_block_test gnuradio_block_test) add_test(gnuradio_block_test gnuradio_block_test)
@ -1076,7 +1076,7 @@ target_include_directories(matio_test
${GNSSSDR_SOURCE_DIR}/src/tests/common-files ${GNSSSDR_SOURCE_DIR}/src/tests/common-files
) )
xcode_delete_duplicates(matio_test) xcode_remove_warning_duplicates(matio_test)
add_test(matio_test matio_test) add_test(matio_test matio_test)
@ -1127,7 +1127,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
) )
endif() endif()
xcode_delete_duplicates(acq_test) xcode_remove_warning_duplicates(acq_test)
add_test(acq_test acq_test) add_test(acq_test acq_test)
@ -1225,7 +1225,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
) )
endif() endif()
xcode_delete_duplicates(trk_test) xcode_remove_warning_duplicates(trk_test)
add_test(trk_test trk_test) add_test(trk_test trk_test)
@ -1258,7 +1258,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
core_receiver core_receiver
) )
xcode_delete_duplicates(control_thread_test) xcode_remove_warning_duplicates(control_thread_test)
add_test(control_thread_test control_thread_test) add_test(control_thread_test control_thread_test)

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

@ -102,8 +102,8 @@ if(PMT_USES_BOOST_ANY)
) )
endif() endif()
include(XcodeDeleteDuplicates) include(XcodeRemoveWarningDuplicates)
xcode_delete_duplicates(front-end-cal) xcode_remove_warning_duplicates(front-end-cal)
if(ENABLE_STRIP) if(ENABLE_STRIP)
set_target_properties(front-end-cal PROPERTIES LINK_FLAGS "-s") set_target_properties(front-end-cal PROPERTIES LINK_FLAGS "-s")

3
src/utils/rinex-tools/CMakeLists.txt
View File

@ -110,6 +110,9 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
set_target_properties(obsdiff PROPERTIES LINK_FLAGS "-s") set_target_properties(obsdiff PROPERTIES LINK_FLAGS "-s")
endif() endif()
include(XcodeRemoveWarningDuplicates)
xcode_remove_warning_duplicates(obsdiff)
add_custom_command(TARGET obsdiff POST_BUILD add_custom_command(TARGET obsdiff POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:obsdiff> COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:obsdiff>
${LOCAL_INSTALL_BASE_DIR}/install/$<TARGET_FILE_NAME:obsdiff> ${LOCAL_INSTALL_BASE_DIR}/install/$<TARGET_FILE_NAME:obsdiff>