From 9382fee5a1606eea597b9a2a5745f122f6cc98b6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 28 Sep 2024 16:04:09 +0200 Subject: [PATCH 1/4] Add spdlog dependency --- recipe/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3acf02e..cfe9ba5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: - do_not_check_failed_test_output_value.patch # [linux] build: - number: 0 + number: 1 outputs: - name: {{ cxx_name }} @@ -41,6 +41,7 @@ outputs: host: - libgz-cmake4 - cli11 + - spdlog run: - cli11 test: @@ -53,6 +54,11 @@ outputs: - if not exist %PREFIX%\\Library\\lib\\{{ name }}.lib exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\{{ name }}.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\cmake\\{{ name }}\\{{ name }}-config.cmake exit 1 # [win] + - cmake-package-check gz-utils3 --targets gz-utils3::log + requires: + - cmake-package-check + - {{ compiler('c') }} + - {{ compiler('cxx') }} - name: {{ name }} build: From f9ee1ae24c6e1bf70fead0571ebb7b981f736425 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 01:11:12 +0200 Subject: [PATCH 2/4] Update meta.yaml --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cfe9ba5..01ae334 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,14 +47,16 @@ outputs: test: commands: - test -f ${PREFIX}/include/gz/{{ component_version }}/gz/{{ component_name }}.hh # [not win] - - test -f ${PREFIX}/lib/lib{{ name }}.so # [linux] - - test -f ${PREFIX}/lib/lib{{ name }}.dylib # [osx] + - test -f ${PREFIX}/lib/lib{{ name }}$SHLIB_EXT + - test -f ${PREFIX}/lib/lib{{ name }}-log$SHLIB_EXT - test -f ${PREFIX}/lib/cmake/{{ name }}/{{ name }}-config.cmake # [not win] - if not exist %PREFIX%\\Library\\include\\gz\\{{ component_version }}\\gz\\{{ component_name }}.hh exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\{{ name }}.lib exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\{{ name }}.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\cmake\\{{ name }}\\{{ name }}-config.cmake exit 1 # [win] - - cmake-package-check gz-utils3 --targets gz-utils3::log + - if not exist %PREFIX%\\Library\\lib\\{{ name }}-log.lib exit 1 # [win] + - if not exist %PREFIX%\\Library\\bin\\{{ name }}-log.dll exit 1 # [win] + - cmake-package-check gz-utils3 --targets gz-utils3::gz-utils3 requires: - cmake-package-check - {{ compiler('c') }} From 3487fa31b8bbf92c33f43941df7b5667ce8ab04d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 23:14:16 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.28.06.15.53 --- .ci_support/linux_64_.yaml | 2 ++ .ci_support/linux_aarch64_.yaml | 2 ++ .ci_support/linux_ppc64le_.yaml | 2 ++ .ci_support/osx_64_.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ .ci_support/win_64_.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index fd1b3b6..58e69e4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +spdlog: +- '1.12' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index a2c0a25..f187dee 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +spdlog: +- '1.12' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d7c23c2..af54b53 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -18,6 +18,8 @@ cxx_compiler_version: - '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +spdlog: +- '1.12' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ebeac92..d2e3bea 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '17' macos_machine: - x86_64-apple-darwin13.4.0 +spdlog: +- '1.12' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0a445c6..f761cf9 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -20,6 +20,8 @@ cxx_compiler_version: - '17' macos_machine: - arm64-apple-darwin20.0.0 +spdlog: +- '1.12' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d1d2b41..878aa25 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -8,5 +8,7 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +spdlog: +- '1.12' target_platform: - win-64 From f708d03660e0b21cf1ece2ab59bd030feb3124c6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 09:34:59 +0200 Subject: [PATCH 4/4] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 01ae334..d1b0abe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,8 +47,8 @@ outputs: test: commands: - test -f ${PREFIX}/include/gz/{{ component_version }}/gz/{{ component_name }}.hh # [not win] - - test -f ${PREFIX}/lib/lib{{ name }}$SHLIB_EXT - - test -f ${PREFIX}/lib/lib{{ name }}-log$SHLIB_EXT + - test -f ${PREFIX}/lib/lib{{ name }}$SHLIB_EXT # [not win] + - test -f ${PREFIX}/lib/lib{{ name }}-log$SHLIB_EXT # [not win] - test -f ${PREFIX}/lib/cmake/{{ name }}/{{ name }}-config.cmake # [not win] - if not exist %PREFIX%\\Library\\include\\gz\\{{ component_version }}\\gz\\{{ component_name }}.hh exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\{{ name }}.lib exit 1 # [win]