diff --git a/env.sh b/env.sh index c5acd011..80e67f67 100644 --- a/env.sh +++ b/env.sh @@ -1,6 +1,6 @@ export MAIN_ROOT=${PWD} -export PATH=${MAIN_ROOT}:${MAIN_ROOT}/utils:${PATH} +export PATH=${MAIN_ROOT}:${MAIN_ROOT}/utils:/usr/local/bin:${PATH} export LC_ALL=C # Use UTF-8 in Python to avoid UnicodeDecodeError when LC_ALL=C diff --git a/speechnn/CMakeLists.txt b/speechnn/CMakeLists.txt index 7fdb5f01..88182eb4 100644 --- a/speechnn/CMakeLists.txt +++ b/speechnn/CMakeLists.txt @@ -16,41 +16,41 @@ set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_CXX_STANDARD 14) -# fc_patch dir -set(FETCHCONTENT_QUIET off) -get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") -set(FETCHCONTENT_BASE_DIR ${fc_patch}) - - -############################################################################### -# Option Configurations -############################################################################### -# option configurations -option(TEST_DEBUG "option for debug" OFF) - - -############################################################################### -# Add local library -############################################################################### -# system lib -find_package() -# if dir have CmakeLists.txt -add_subdirectory() -# if dir do not have CmakeLists.txt -add_library(lib_name STATIC file.cc) -target_link_libraries(lib_name item0 item1) -add_dependencies(lib_name depend-target) - - -############################################################################### -# Library installation -############################################################################### -install() - - -############################################################################### -# Build binary file -############################################################################### -add_executable() -target_link_libraries() - +# # fc_patch dir +# set(FETCHCONTENT_QUIET off) +# get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") +# set(FETCHCONTENT_BASE_DIR ${fc_patch}) +# +# +# ############################################################################### +# # Option Configurations +# ############################################################################### +# # option configurations +# option(TEST_DEBUG "option for debug" OFF) +# +# +# ############################################################################### +# # Add local library +# ############################################################################### +# # system lib +# find_package() +# # if dir have CmakeLists.txt +# add_subdirectory() +# # if dir do not have CmakeLists.txt +# add_library(lib_name STATIC file.cc) +# target_link_libraries(lib_name item0 item1) +# add_dependencies(lib_name depend-target) +# +# +# ############################################################################### +# # Library installation +# ############################################################################### +# install() +# +# +# ############################################################################### +# # Build binary file +# ############################################################################### +# add_executable() +# target_link_libraries() +# diff --git a/speechnn/cmake/third_party.cmake b/speechnn/cmake/third_party.cmake index 7313cfa8..fdd7b53c 100644 --- a/speechnn/cmake/third_party.cmake +++ b/speechnn/cmake/third_party.cmake @@ -190,9 +190,8 @@ endif() ########################### include third_party according to flags ############################### include(third_party/libsndfile) # download, build, install libsndfile -include(third_party/zlib) # download, build, install zlib include(third_party/boost) # download boost include(third_party/eigen) # download eigen3 -include(third_party/threadpool)# download threadpool +include(third_party/threadpool) # download threadpool diff --git a/speechnn/cmake/third_party/absl.cmake b/speechnn/cmake/third_party/absl.cmake index a060b88c..c2a8eceb 100644 --- a/speechnn/cmake/third_party/absl.cmake +++ b/speechnn/cmake/third_party/absl.cmake @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.14) +include(ExternalProject) include(FetchContent) FetchContent_Declare( diff --git a/speechnn/cmake/third_party/libsndfile.cmake b/speechnn/cmake/third_party/libsndfile.cmake index b555a873..05d5c6ed 100644 --- a/speechnn/cmake/third_party/libsndfile.cmake +++ b/speechnn/cmake/third_party/libsndfile.cmake @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.14) +include(ExternalProject) include(FetchContent) FetchContent_Declare( diff --git a/speechnn/cmake/third_party/openfst.cmake b/speechnn/cmake/third_party/openfst.cmake index d93ea24c..39f335a1 100644 --- a/speechnn/cmake/third_party/openfst.cmake +++ b/speechnn/cmake/third_party/openfst.cmake @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.14) +include(ExternalProject) include(FetchContent) FetchContent_Declare(