mirror of
https://github.com/csukuangfj/kaldifeat.git
synced 2025-08-09 01:52:39 +00:00
switch C++14 -> C++17, so it becomes compatible with Pytorch 2.4
This commit is contained in:
parent
0355ed8ced
commit
1e98fe10da
@ -17,6 +17,7 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
|||||||
set(BUILD_RPATH_USE_ORIGIN TRUE)
|
set(BUILD_RPATH_USE_ORIGIN TRUE)
|
||||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
|
|
||||||
|
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
set(kaldifeat_rpath_origin "$ORIGIN")
|
set(kaldifeat_rpath_origin "$ORIGIN")
|
||||||
else()
|
else()
|
||||||
@ -33,7 +34,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT CMAKE_CXX_STANDARD)
|
if (NOT CMAKE_CXX_STANDARD)
|
||||||
set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ version to be used.")
|
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ version to be used.")
|
||||||
endif()
|
endif()
|
||||||
message(STATUS "C++ Standard version: ${CMAKE_CXX_STANDARD}")
|
message(STATUS "C++ Standard version: ${CMAKE_CXX_STANDARD}")
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
@ -45,7 +46,6 @@ option(BUILD_SHARED_LIBS "Whether to build shared libraries" ON)
|
|||||||
option(kaldifeat_BUILD_TESTS "Whether to build tests or not" ON)
|
option(kaldifeat_BUILD_TESTS "Whether to build tests or not" ON)
|
||||||
option(kaldifeat_BUILD_PYMODULE "Whether to build python module or not" ON)
|
option(kaldifeat_BUILD_PYMODULE "Whether to build python module or not" ON)
|
||||||
|
|
||||||
|
|
||||||
message(STATUS "BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}")
|
message(STATUS "BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}")
|
||||||
|
|
||||||
if(BUILD_SHARED_LIBS AND MSVC)
|
if(BUILD_SHARED_LIBS AND MSVC)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user