diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e7a4a0ee..40dc40f0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,9 +38,12 @@ endforeach() if(ENABLE_BUILD_VERBOSE) message("User Args : ${USER_ARGS}") endif() + if(NOT CMAKE_GENERATOR_PLATFORM AND WIN32) - set(CMAKE_GENERATOR_PLATFORM "Win32") - message(STATUS "Setting Platform to ${CMAKE_GENERATOR_PLATFORM}") + if(NOT ${CMAKE_GENERATOR} MATCHES "Ninja") + set(CMAKE_GENERATOR_PLATFORM "Win32") + message(STATUS "Setting Platform to ${CMAKE_GENERATOR_PLATFORM}") + endif() endif() project(linphoneqt) diff --git a/linphone-sdk b/linphone-sdk index 4fde8b4bd..e425b6d47 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 4fde8b4bd6a839bd8a2ea9aeb99cd4e8a85fda65 +Subproject commit e425b6d4758b70e2d5b1f8f075d6bdb68c895918