From b5c19185ea8f35569618be7686030e8959dd268d Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Mon, 11 Oct 2021 13:55:09 +0800 Subject: [PATCH] Update CMakeLists.txt so that kaldifeat can be included in k2. --- CMakeLists.txt | 9 ++++++--- kaldifeat/csrc/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d418afe..84a406c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,12 +32,15 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -option(BUILD_TESTS "Whether to build tests or not" ON) +option(kaldifeat_BUILD_TESTS "Whether to build tests or not" ON) + +if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) + include(pybind11) +endif() -include(pybind11) include(torch) -if(BUILD_TESTS) +if(kaldifeat_BUILD_TESTS) include(googletest) enable_testing() endif() diff --git a/kaldifeat/csrc/CMakeLists.txt b/kaldifeat/csrc/CMakeLists.txt index 13b9f9b..8dce57c 100644 --- a/kaldifeat/csrc/CMakeLists.txt +++ b/kaldifeat/csrc/CMakeLists.txt @@ -36,7 +36,7 @@ function(kaldifeat_add_test source) ) endfunction() -if(BUILD_TESTS) +if(kaldifeat_BUILD_TESTS) # please sort the source files alphabetically set(test_srcs feature-window-test.cc