mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-26 04:57:40 +00:00
Code Issues Releases Wiki Activity

Move patch files of external tools to their own folder

Browse Source
This commit is contained in:
Carles Fernandez
2025-08-07 13:33:12 +02:00
parent 13ef99ec57
commit 4d616a006e
8 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -3364,7 +3364,7 @@ if(ENABLE_ION)
message(FATAL_ERROR "The patch command is not found. It is required to build the ION GNSS-SDR Metadata Standard. Please check your OS documentation and install the patch command.") message(FATAL_ERROR "The patch command is not found. It is required to build the ION GNSS-SDR Metadata Standard. Please check your OS documentation and install the patch command.")
endif() endif()
set(ION_METADATA_PATCH_COMMAND set(ION_METADATA_PATCH_COMMAND
${Patch_EXECUTABLE} -p0 -i ${GNSSSDR_SOURCE_DIR}/tests/data/ion_gnss_standard_cmake.patch ${Patch_EXECUTABLE} -p0 -i ${GNSSSDR_SOURCE_DIR}/utils/patches/ion_gnss_standard_cmake.patch
) )
endif() endif()
# Patch only once # Patch only once

10
tests/CMakeLists.txt
View File

@@ -366,13 +366,13 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
if(CMAKE_VERSION VERSION_GREATER 3.17.0) if(CMAKE_VERSION VERSION_GREATER 3.17.0)
set(GNSSTK_PATCH_COMMAND set(GNSSTK_PATCH_COMMAND
cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} && cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} &&
${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static15.patch ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/common-files/gnsstk_static15.patch
) )
else() else()
set(GNSSTK_PATCH_COMMAND set(GNSSTK_PATCH_COMMAND
cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} && cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} &&
${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static13.patch && ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/utils/patches/gnsstk_static13.patch &&
${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_gcc13.patch ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/utils/patches/gnsstk_gcc13.patch
) )
endif() endif()
# Patch only once # Patch only once
@@ -406,7 +406,9 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
set(GNSSTK_PARALLEL_BUILD "-j${NUMBER_OF_PROCESSORS}") set(GNSSTK_PARALLEL_BUILD "-j${NUMBER_OF_PROCESSORS}")
endif() endif()
endif() endif()
set(GNSSTK_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-w") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT WIN32)
set(GNSSTK_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-w")
endif()
if(CMAKE_VERSION VERSION_GREATER 3.17.0) if(CMAKE_VERSION VERSION_GREATER 3.17.0)
set(GNSSTK_CXX_STANDARD 17) set(GNSSTK_CXX_STANDARD 17)
if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND ("${DARWIN_VERSION}" VERSION_GREATER_EQUAL "14")) if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND ("${DARWIN_VERSION}" VERSION_GREATER_EQUAL "14"))

0
tests/data/gnsstk_gcc13.patch → utils/patches/gnsstk_gcc13.patch
View File

0
tests/data/gnsstk_static13.patch → utils/patches/gnsstk_static13.patch
View File

6
tests/data/gnsstk_static15.patch → utils/patches/gnsstk_static15.patch
View File

@@ -1,7 +1,7 @@
SPDX-License-Identifier: GPL-3.0-or-later SPDX-License-Identifier: GPL-3.0-or-later
SPDX-FileCopyrightText: 2022 Carles Fernandez-Prades <carles.fernandez@cttc.es> SPDX-FileCopyrightText: 2025 Carles Fernandez-Prades <carles.fernandez@cttc.es>
--- CMakeLists.txt 2022-12-19 11:40:38.000000000 +0100 --- CMakeLists.txt 2025-08-07 11:40:38.000000000 +0100
+++ CMakeLists.txt 2022-12-19 11:56:49.000000000 +0100 +++ CMakeLists.txt 2025-08-07 11:56:49.000000000 +0100
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
# Is dependend on by $GNSSTK/build.sh # Is dependend on by $GNSSTK/build.sh
#============================================================ #============================================================

0
tests/data/ion_gnss_standard_cmake.patch → utils/patches/ion_gnss_standard_cmake.patch
View File

4
utils/rinex-tools/CMakeLists.txt
View File

@@ -38,7 +38,9 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14) # Required by GPSTk v3.0.0 set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14) # Required by GPSTk v3.0.0
endif() endif()
# Do not show warnings raised by GPSTk / GNSSTk # Do not show warnings raised by GPSTk / GNSSTk
target_compile_options(obsdiff PRIVATE -w) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT WIN32)
target_compile_options(obsdiff PRIVATE -w)
endif()
if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO) if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
add_dependencies(obsdiff armadillo-${armadillo_RELEASE}) add_dependencies(obsdiff armadillo-${armadillo_RELEASE})

4
utils/rinex2assist/CMakeLists.txt
View File

@@ -74,7 +74,9 @@ if(TARGET Boost::iostreams AND TARGET Boost::serialization)
endif() endif()
# Do not show warnings raised by GPSTk / GNSSTk # Do not show warnings raised by GPSTk / GNSSTk
target_compile_options(rinex2assist PRIVATE -w) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT WIN32)
target_compile_options(rinex2assist PRIVATE -w)
endif()
target_link_libraries(rinex2assist target_link_libraries(rinex2assist
PRIVATE PRIVATE