fix BUILD_TYPE bug

pull/3026/head
Hui Zhang 3 years ago
parent 98b90bd2c1
commit dee5a3e360

@ -7,16 +7,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(system) include(system)
# Ninja Generator will set CMAKE_BUILD_TYPE to Debug
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE
"Release"
CACHE
STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel"
FORCE)
endif()
project(paddlespeech VERSION 0.1) project(paddlespeech VERSION 0.1)
set(PPS_VERSION_MAJOR 1) set(PPS_VERSION_MAJOR 1)
@ -24,9 +14,6 @@ set(PPS_VERSION_MINOR 0)
set(PPS_VERSION_PATCH 0) set(PPS_VERSION_PATCH 0)
set(PPS_VERSION "${PPS_VERSION_MAJOR}.${PPS_VERSION_MINOR}.${PPS_VERSION_PATCH}") set(PPS_VERSION "${PPS_VERSION_MAJOR}.${PPS_VERSION_MINOR}.${PPS_VERSION_PATCH}")
include(FetchContent)
include(ExternalProject)
# fc_patch dir # fc_patch dir
set(FETCHCONTENT_QUIET off) set(FETCHCONTENT_QUIET off)
get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
@ -38,16 +25,11 @@ set(PPS_CXX_STANDARD 14)
# set std-14 # set std-14
set(CMAKE_CXX_STANDARD ${PPS_CXX_STANDARD}) set(CMAKE_CXX_STANDARD ${PPS_CXX_STANDARD})
add_compile_options(-fPIC)
# compiler option # Ninja Generator will set CMAKE_BUILD_TYPE to Debug
# Keep the same with openfst, -fPIC or -fpic if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g -ldl") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel" FORCE)
SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g -ggdb") endif()
SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} --std=c++14 -pthread -fPIC -O3 -Wall")
# install dir into `build/install`
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
# find_* e.g. find_library work when Cross-Compiling # find_* e.g. find_library work when Cross-Compiling
if(ANDROID) if(ANDROID)
@ -57,6 +39,11 @@ if(ANDROID)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
endif() endif()
# install dir into `build/install`
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
include(FetchContent)
include(ExternalProject)
############################################################################### ###############################################################################
# Option Configurations # Option Configurations
############################################################################### ###############################################################################
@ -98,6 +85,7 @@ endif()
############################################################################### ###############################################################################
# Find Package # Find Package
############################################################################### ###############################################################################
# https://github.com/Kitware/CMake/blob/v3.1.0/Modules/FindThreads.cmake#L207
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
if(WITH_ASR) if(WITH_ASR)

@ -25,5 +25,6 @@ set(BINS
foreach(bin_name IN LISTS BINS) foreach(bin_name IN LISTS BINS)
add_executable(${bin_name} ${CMAKE_CURRENT_SOURCE_DIR}/${bin_name}.cc) add_executable(${bin_name} ${CMAKE_CURRENT_SOURCE_DIR}/${bin_name}.cc)
target_include_directories(${bin_name} PRIVATE ${SPEECHX_ROOT} ${SPEECHX_ROOT}/kaldi) target_include_directories(${bin_name} PRIVATE ${SPEECHX_ROOT} ${SPEECHX_ROOT}/kaldi)
target_link_libraries(${bin_name} PUBLIC frontend base utils kaldi-util gflags extern_glog) # https://github.com/Kitware/CMake/blob/v3.1.0/Modules/FindThreads.cmake#L207
target_link_libraries(${bin_name} PUBLIC frontend base utils kaldi-util gflags Threads::Threads extern_glog)
endforeach() endforeach()
Loading…
Cancel
Save