mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-10-12 18:51:51 +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
8 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+3 -3
View File
@@ -77,8 +77,8 @@ if(UNIX)
)
endif()
include(XcodeDeleteDuplicates)
xcode_delete_duplicates(volk_gnsssdr_profile)
include(XcodeRemoveWarningDuplicates)
xcode_remove_warning_duplicates(volk_gnsssdr_profile)
if(ENABLE_STRIP)
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
@@ -109,7 +109,7 @@ if(UNIX)
)
endif()
xcode_delete_duplicates(volk_gnsssdr-config-info)
xcode_remove_warning_duplicates(volk_gnsssdr-config-info)
if(ENABLE_STRIP)
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/XcodeDeleteDuplicates.cmake → src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/XcodeRemoveWarningDuplicates.cmake
+3 -3
View File
@@ -4,12 +4,12 @@
# SPDX-FileCopyrightText: 2011-2024 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause
if(DEFINED __INCLUDED_XCODE_DELETE_DUPLICATES_CMAKE)
if(DEFINED __INCLUDED_XCODE_REMOVE_WARNING_DUPLICATES_CMAKE)
return()
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_VERSION VERSION_GREATER_EQUAL "15.0.0")
# A bug in Xcode 15 adds duplicate flags to the linker. In addition, the
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+4 -4
View File
@@ -4,7 +4,7 @@
# SPDX-FileCopyrightText: 2010-2021 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause
include(XcodeDeleteDuplicates)
include(XcodeRemoveWarningDuplicates)
########################################################################
# 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})
endif()
xcode_delete_duplicates(volk_gnsssdr)
xcode_remove_warning_duplicates(volk_gnsssdr)
target_include_directories(volk_gnsssdr
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)
xcode_delete_duplicates(volk_gnsssdr_static)
xcode_remove_warning_duplicates(volk_gnsssdr_static)
install(TARGETS volk_gnsssdr_static
EXPORT VOLK_GNSSSDR-export
@@ -709,7 +709,7 @@ if(ENABLE_TESTING)
)
endif()
xcode_delete_duplicates(volk_gnsssdr_test_all)
xcode_remove_warning_duplicates(volk_gnsssdr_test_all)
foreach(kernel ${h_files})
get_filename_component(kernel ${kernel} NAME)