From ca32a483db5e80fc6054c10b2ca0a244eed9edc3 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Mon, 14 Feb 2022 22:18:48 +0200 Subject: [PATCH] - fix build options for Windows --- src/engine/audio/CMakeLists.txt | 1 + src/engine/helper/CMakeLists.txt | 2 ++ src/engine/media/CMakeLists.txt | 2 ++ src/libs/g722/CMakeLists.txt | 2 ++ src/libs/gsmhr/CMakeLists.txt | 1 + src/libs/ice/CMakeLists.txt | 1 + src/libs/jrtplib/src/CMakeLists.txt | 2 ++ src/libs/libg729/CMakeLists.txt | 1 + src/libs/libgsm/CMakeLists.txt | 1 + src/libs/speexdsp/CMakeLists.txt | 2 ++ src/libs/webrtc/CMakeLists.txt | 2 ++ 11 files changed, 17 insertions(+) diff --git a/src/engine/audio/CMakeLists.txt b/src/engine/audio/CMakeLists.txt index 0714aec8..3dfd3cb0 100644 --- a/src/engine/audio/CMakeLists.txt +++ b/src/engine/audio/CMakeLists.txt @@ -22,6 +22,7 @@ set (AUDIOLIB_SOURCES ) add_library(audio_lib ${AUDIOLIB_SOURCES}) +set_property(TARGET audio_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") ## target_include_directories(audio_lib diff --git a/src/engine/helper/CMakeLists.txt b/src/engine/helper/CMakeLists.txt index da91327d..8ccb55f0 100644 --- a/src/engine/helper/CMakeLists.txt +++ b/src/engine/helper/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required (VERSION 3.15) project (helper_lib) # Rely on C++ 11 @@ -11,6 +12,7 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON) file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h") add_library(helper_lib ${HELPER_LIB_SOURCES}) +set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") # Private include directories target_include_directories(helper_lib PRIVATE ../../libs/ ../../engine ../) diff --git a/src/engine/media/CMakeLists.txt b/src/engine/media/CMakeLists.txt index f16aa9d1..3ecd61c3 100644 --- a/src/engine/media/CMakeLists.txt +++ b/src/engine/media/CMakeLists.txt @@ -79,6 +79,8 @@ if (CMAKE_SYSTEM MATCHES "Windows*") endif() add_library(media_lib ${SOURCES}) +set_property(TARGET media_lib PROPERTY + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") target_include_directories(media_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/ diff --git a/src/libs/g722/CMakeLists.txt b/src/libs/g722/CMakeLists.txt index 3a88f75c..7febbc9f 100644 --- a/src/libs/g722/CMakeLists.txt +++ b/src/libs/g722/CMakeLists.txt @@ -13,3 +13,5 @@ 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 e417040c..b5c13ff3 100644 --- a/src/libs/gsmhr/CMakeLists.txt +++ b/src/libs/gsmhr/CMakeLists.txt @@ -12,3 +12,4 @@ 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/ice/CMakeLists.txt b/src/libs/ice/CMakeLists.txt index ee81d3e2..9e37b3d1 100644 --- a/src/libs/ice/CMakeLists.txt +++ b/src/libs/ice/CMakeLists.txt @@ -37,3 +37,4 @@ set (ICE_STACK_SOURCES ICEAddress.cpp add_definitions(-DUSE_NATIVE_SMARTPTR -D_WINSOCK_DEPRECATED_NO_WARNINGS) add_library(ice_stack ${ICE_STACK_SOURCES}) +set_property(TARGET ice_stack PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/jrtplib/src/CMakeLists.txt b/src/libs/jrtplib/src/CMakeLists.txt index a6e5b86d..d10890e7 100644 --- a/src/libs/jrtplib/src/CMakeLists.txt +++ b/src/libs/jrtplib/src/CMakeLists.txt @@ -91,4 +91,6 @@ set(JRTPLIB_SOURCES rtpexternaltransmitter.cpp) add_library(jrtplib STATIC ${JRTPLIB_SOURCES}) +set_property(TARGET jrtplib PROPERTY + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/libg729/CMakeLists.txt b/src/libs/libg729/CMakeLists.txt index 1a19ee25..13f24cf2 100644 --- a/src/libs/libg729/CMakeLists.txt +++ b/src/libs/libg729/CMakeLists.txt @@ -37,3 +37,4 @@ 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 9fc71762..21f4fdae 100644 --- a/src/libs/libgsm/CMakeLists.txt +++ b/src/libs/libgsm/CMakeLists.txt @@ -26,3 +26,4 @@ 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/speexdsp/CMakeLists.txt b/src/libs/speexdsp/CMakeLists.txt index 129b6f9d..9b6d9c93 100644 --- a/src/libs/speexdsp/CMakeLists.txt +++ b/src/libs/speexdsp/CMakeLists.txt @@ -25,3 +25,5 @@ target_compile_definitions(speexdsp PUBLIC -DUSE_KISS_FFT -DFIXED_POINT -DHAVE_S 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 ee1f077a..9407743a 100644 --- a/src/libs/webrtc/CMakeLists.txt +++ b/src/libs/webrtc/CMakeLists.txt @@ -179,3 +179,5 @@ 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>")