Skip to content

Commit

Permalink
Rebuild for spdlog 1.13 (#268)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] authored May 14, 2024
2 parents 2deeaa5 + 70a4f96 commit 31f7401
Show file tree
Hide file tree
Showing 34 changed files with 78 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/spdlog113.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for spdlog 1.13
kind: version
migration_number: 1
migrator_ts: 1713915385.2147813
spdlog:
- '1.13'
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
soapysdr:
- '0.8'
spdlog:
- '1.12'
- '1.13'
sqlite:
- '3'
target_platform:
Expand Down
27 changes: 27 additions & 0 deletions recipe/0007-cmake-remove-maximum-version-for-Qwt-was-6.3.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeff Long <willcode4@gmail.com>
Date: Fri, 10 May 2024 06:21:08 -0400
Subject: [PATCH] cmake: remove maximum version for Qwt (was < 6.3)

Signed-off-by: Jeff Long <willcode4@gmail.com>
---
cmake/Modules/FindQwt.cmake | 3 ---
1 file changed, 3 deletions(-)

diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index 8718a6f73..e87c6a20a 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -32,9 +32,6 @@ if(QWT_INCLUDE_DIRS)
if(QWT_VERSION VERSION_LESS "6.1")
set(QWT_WRONG_VERSION True)
endif()
- if(NOT QWT_VERSION VERSION_LESS "6.3")
- set(QWT_WRONG_VERSION True)
- endif()

message(STATUS "QWT Version: ${QWT_VERSION}")
if(NOT QWT_WRONG_VERSION)
--
2.42.0

Loading

0 comments on commit 31f7401

Please sign in to comment.