From 88627631b6491fe9621c5384d01119eda69b8820 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Wed, 1 Jun 2022 23:01:59 +0800 Subject: [PATCH] Minor release. --- CMakeLists.txt | 14 +++++++++----- scripts/conda/kaldifeat/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 806e0f8..84fdbe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,18 +6,22 @@ project(kaldifeat) # remember to change the version in # scripts/conda/kaldifeat/meta.yaml -set(kaldifeat_VERSION "1.15.2") +set(kaldifeat_VERSION "1.15.3") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +set(CMAKE_SKIP_BUILD_RPATH FALSE) +set(BUILD_RPATH_USE_ORIGIN TRUE) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +set(CMAKE_BUILD_RPATH "$ORIGIN") + if(NOT APPLE) - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(BUILD_RPATH_USE_ORIGIN TRUE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH "$ORIGIN") - set(CMAKE_BUILD_RPATH "$ORIGIN") +else() + set(CMAKE_MACOSX_RPATH ON) + set(CMAKE_INSTALL_RPATH "@loader_path") endif() set(BUILD_SHARED_LIBS ON) diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml index 61bd455..e375897 100644 --- a/scripts/conda/kaldifeat/meta.yaml +++ b/scripts/conda/kaldifeat/meta.yaml @@ -1,6 +1,6 @@ package: name: kaldifeat - version: "1.15.2" + version: "1.15.3" source: path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"