public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix used C++ standard (closer to full C++ 20)

This commit is contained in:
Dmytro Bogovych 2024-11-05 11:44:53 +03:00
parent f3ebe11a42
commit 5bf8d665e2
12 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(rtphone)
# Rely on C++ 17 # Rely on C++ 17
set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (rtphone_libs libs) set (rtphone_libs libs)
@ -17,9 +17,7 @@ option (USE_MUSL "Build with MUSL library" OFF)
# PIC code by default # PIC code by default
set (CMAKE_POSITION_INDEPENDENT_CODE ON) set (CMAKE_POSITION_INDEPENDENT_CODE ON)
if (NOT DEFINED LIB_PLATFORM) set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries)
endif()
include (${LIB_PLATFORM}/platform_libs.cmake) include (${LIB_PLATFORM}/platform_libs.cmake)
message("Libraries: ${LIB_PLATFORM}") message("Libraries: ${LIB_PLATFORM}")

2
src/engine/audio/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (audio_lib) project (audio_lib)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

4
src/engine/helper/CMakeLists.txt
View File

@ -5,7 +5,7 @@ project (helper_lib)
set (CMAKE_CXX_STANDARD 20) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (CMAKE_POSITION_INDEPENDENT_CODE OFF) set (CMAKE_POSITION_INDEPENDENT_CODE ON)
file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h") file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h")
@ -15,4 +15,6 @@ set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
# Private include directories # Private include directories
target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .) target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .)
target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE) target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE)
if (TARGET_LINUX)
target_link_libraries (helper_lib PUBLIC uuid) target_link_libraries (helper_lib PUBLIC uuid)
endif()

10
src/engine/media/CMakeLists.txt
View File

@ -1,7 +1,11 @@
project (media_lib) project (media_lib)
# Rely on C++ 11 if (NOT DEFINED LIB_PLATFORM)
set (CMAKE_CXX_STANDARD 11) message(FATAL_ERROR media_lib project requires LIB_PLATFORM to be set - it uses libraries from that directory)
endif()
# Rely on C++ 20
set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
# Produce PIC code always # Produce PIC code always
@ -48,7 +52,7 @@ add_library(media_lib ${SOURCES})
set (LIBS_CODEC) set (LIBS_CODEC)
if (USE_AMR_CODEC) if (USE_AMR_CODEC)
include (../../../../libraries/platform_libs.cmake) include (${LIB_PLATFORM}/platform_libs.cmake)
message("Media: AMR NB and WB codecs will be included.") message("Media: AMR NB and WB codecs will be included.")
target_compile_definitions(media_lib PUBLIC USE_AMR_CODEC) target_compile_definitions(media_lib PUBLIC USE_AMR_CODEC)
list (APPEND LIBS_CODEC ${OPENCORE_AMRNB} ${OPENCORE_AMRWB}) list (APPEND LIBS_CODEC ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})

2
src/libs/g722/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (g722_codec) project (g722_codec)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/gsmhr/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (gsmhr_codec) project (gsmhr_codec)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/ice/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (ice_stack) project (ice_stack)
# Rely on C++ 17 # Rely on C++ 17
set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/libg729/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (g729) project (g729)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/libgsm/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (gsm_codec) project (gsm_codec)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/resiprocate

@ -1 +1 @@
Subproject commit 44e04f27e61f8cae5d019fd994d9d949d37c9b4a Subproject commit 4aa84430a14153a6666ab925e5fe22edae53127b

2
src/libs/speexdsp/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (speexdsp) project (speexdsp)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

2
src/libs/srtp/CMakeLists.txt
View File

@ -1,7 +1,7 @@
project (srtp) project (srtp)
# Rely on C++ 11 # Rely on C++ 11
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 20)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set (CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)