From 6caabf285c56a9126dc1a1a2733702842be342a2 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Tue, 7 Apr 2026 18:18:57 +0300 Subject: [PATCH] - remove commented MSVC runtime library related code --- src/CMakeLists.txt | 3 --- src/libs/g722/CMakeLists.txt | 1 - src/libs/gsmhr/CMakeLists.txt | 1 - src/libs/jrtplib/src/CMakeLists.txt | 1 - src/libs/libevs/CMakeLists.txt | 2 -- src/libs/libg729/CMakeLists.txt | 1 - src/libs/libgsm/CMakeLists.txt | 1 - src/libs/opus/CMakeLists.txt | 8 -------- src/libs/speexdsp/CMakeLists.txt | 2 -- src/libs/webrtc/CMakeLists.txt | 2 -- 10 files changed, 22 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f7662f0..19f81938 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -388,9 +388,6 @@ target_include_directories(rtphone ${L}/libs/json ) -# For MSVC static builds -# set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - find_package(OpenSSL REQUIRED) target_link_libraries(rtphone PUBLIC OpenSSL::SSL) target_link_libraries(rtphone PUBLIC OpenSSL::Crypto) diff --git a/src/libs/g722/CMakeLists.txt b/src/libs/g722/CMakeLists.txt index c9eb5fce..006d16b9 100644 --- a/src/libs/g722/CMakeLists.txt +++ b/src/libs/g722/CMakeLists.txt @@ -13,5 +13,4 @@ set (G722_SOURCES ) add_library(g722_codec ${G722_SOURCES}) -# set_property(TARGET g722_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/gsmhr/CMakeLists.txt b/src/libs/gsmhr/CMakeLists.txt index b6f5c081..3489b482 100644 --- a/src/libs/gsmhr/CMakeLists.txt +++ b/src/libs/gsmhr/CMakeLists.txt @@ -12,4 +12,3 @@ set (GSMHR_SOURCES ) add_library(gsmhr_codec ${GSMHR_SOURCES}) -# set_property(TARGET gsmhr_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/jrtplib/src/CMakeLists.txt b/src/libs/jrtplib/src/CMakeLists.txt index c182a228..468ab292 100644 --- a/src/libs/jrtplib/src/CMakeLists.txt +++ b/src/libs/jrtplib/src/CMakeLists.txt @@ -93,5 +93,4 @@ set(JRTPLIB_SOURCES add_library(jrtplib STATIC ${JRTPLIB_SOURCES}) target_include_directories(jrtplib PUBLIC .) -# set_property(TARGET jrtplib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") target_include_directories(jrtplib PUBLIC .) diff --git a/src/libs/libevs/CMakeLists.txt b/src/libs/libevs/CMakeLists.txt index 5ee00808..513f3346 100644 --- a/src/libs/libevs/CMakeLists.txt +++ b/src/libs/libevs/CMakeLists.txt @@ -14,5 +14,3 @@ target_include_directories(evs_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/basic_o ${CMAKE_CURRENT_SOURCE_DIR}/lib_enc ${CMAKE_CURRENT_SOURCE_DIR}/lib_dec ${CMAKE_CURRENT_SOURCE_DIR}/lib_com) - -# set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/libg729/CMakeLists.txt b/src/libs/libg729/CMakeLists.txt index 9518d351..597576d4 100644 --- a/src/libs/libg729/CMakeLists.txt +++ b/src/libs/libg729/CMakeLists.txt @@ -37,4 +37,3 @@ set (G729_SOURCES ) add_library(g729_codec ${G729_SOURCES}) -# set_property(TARGET g729_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/libgsm/CMakeLists.txt b/src/libs/libgsm/CMakeLists.txt index 401cebab..e723229a 100644 --- a/src/libs/libgsm/CMakeLists.txt +++ b/src/libs/libgsm/CMakeLists.txt @@ -26,4 +26,3 @@ set (GSM_SOURCES add_library(gsm_codec ${GSM_SOURCES}) target_include_directories(gsm_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_compile_definitions(gsm_codec PUBLIC HAS_STDLIB_H HAS_STRING_H) -# set_property(TARGET gsm_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/opus/CMakeLists.txt b/src/libs/opus/CMakeLists.txt index 8535ad5f..5faa50b3 100644 --- a/src/libs/opus/CMakeLists.txt +++ b/src/libs/opus/CMakeLists.txt @@ -271,14 +271,6 @@ if(OPUS_CUSTOM_MODES) list(APPEND Opus_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_custom.h) endif() -if(MSVC) - if(OPUS_STATIC_RUNTIME) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - else() - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") - endif() -endif() - add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER}) add_library(Opus::opus ALIAS opus) diff --git a/src/libs/speexdsp/CMakeLists.txt b/src/libs/speexdsp/CMakeLists.txt index 9497344f..ec09cbf5 100644 --- a/src/libs/speexdsp/CMakeLists.txt +++ b/src/libs/speexdsp/CMakeLists.txt @@ -25,5 +25,3 @@ target_compile_definitions(speexdsp PUBLIC -DUSE_KISS_FFT -DFLOATING_POINT -DHAV target_include_directories(speexdsp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libspeexdsp ${CMAKE_CURRENT_SOURCE_DIR}/include) - -# set_property(TARGET speexdsp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/webrtc/CMakeLists.txt b/src/libs/webrtc/CMakeLists.txt index 842d355b..ee1f077a 100644 --- a/src/libs/webrtc/CMakeLists.txt +++ b/src/libs/webrtc/CMakeLists.txt @@ -179,5 +179,3 @@ target_include_directories(webrtc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/signal_processing_library ${CMAKE_CURRENT_SOURCE_DIR}/utility ) - -# set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>")