From 336124fb65ed5dc9578b0cc97d1a6a05c8afcf6f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 20 Oct 2022 12:31:12 +0200 Subject: [PATCH 1/3] Update fix-backward-install.patch --- recipe/fix-backward-install.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/recipe/fix-backward-install.patch b/recipe/fix-backward-install.patch index 5c9896b..202bd67 100644 --- a/recipe/fix-backward-install.patch +++ b/recipe/fix-backward-install.patch @@ -1,18 +1,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9f64f01..c272803 100644 +index 8bd7561..9bbdc73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -38,12 +38,7 @@ install (TARGETS backward DESTINATION ${LIB_INSTALL_DIR}) +@@ -41,7 +41,9 @@ install (TARGETS backward #=============================================================================== # Used for the installed version. -if(APPLE) -- # On macOS, the full path to the library since DYLD_LIBRARY_PATH may not work. -- set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$) --else() -- set(backward_library_name $) --endif() -+set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$) - - # Two steps to create `ign`, First using `configure_file`, to interpolate cmake variables. Then - # use `file(GENERATE ...)` to use generator expressions ++if(NOT WIN32) ++ # If we are not on Windows specify the full path as the different ways that dlopen ++ # has to find libraries without full path may not work (while on Windows PATH should work) + # On macOS, the full path to the library since DYLD_LIBRARY_PATH may not work. + set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$) + else() From 4a848e65a2571c36369ab568cf7b539fe6c8a4a4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 20 Oct 2022 12:31:24 +0200 Subject: [PATCH 2/3] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d830044..253ea1e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - fix-backward-install.patch build: - number: 0 + number: 1 skip: false run_exports: - {{ pin_subpackage(name, max_pin='x') }} From 469bcefd9a58f5101fb89255fc33fe277a72b45e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:33:40 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.19.23.15.01 --- .ci_support/osx_64_ruby2.5.yaml | 4 ++-- .ci_support/osx_64_ruby2.6.yaml | 4 ++-- .ci_support/osx_arm64_ruby2.5.yaml | 4 ++-- .ci_support/osx_arm64_ruby2.6.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/osx_64_ruby2.5.yaml b/.ci_support/osx_64_ruby2.5.yaml index d844a4b..0cdc579 100644 --- a/.ci_support/osx_64_ruby2.5.yaml +++ b/.ci_support/osx_64_ruby2.5.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - x86_64-apple-darwin13.4.0 ruby: diff --git a/.ci_support/osx_64_ruby2.6.yaml b/.ci_support/osx_64_ruby2.6.yaml index e35c39a..60761f7 100644 --- a/.ci_support/osx_64_ruby2.6.yaml +++ b/.ci_support/osx_64_ruby2.6.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - x86_64-apple-darwin13.4.0 ruby: diff --git a/.ci_support/osx_arm64_ruby2.5.yaml b/.ci_support/osx_arm64_ruby2.5.yaml index 75c89b1..35f0c2e 100644 --- a/.ci_support/osx_arm64_ruby2.5.yaml +++ b/.ci_support/osx_arm64_ruby2.5.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - arm64-apple-darwin20.0.0 ruby: diff --git a/.ci_support/osx_arm64_ruby2.6.yaml b/.ci_support/osx_arm64_ruby2.6.yaml index ed3a086..74f6e86 100644 --- a/.ci_support/osx_arm64_ruby2.6.yaml +++ b/.ci_support/osx_arm64_ruby2.6.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - arm64-apple-darwin20.0.0 ruby: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d1de257..2614db3 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,10 +1,10 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 target_platform: - win-64