From 9fb5ead0fd46ce47b7b023452b00c5d3be881418 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 3 Aug 2020 16:05:39 +0200 Subject: [PATCH] Repair master SDK build by using find_library in Windows to select path file from SDK libraries Update SDK --- linphone-app/CMakeLists.txt | 16 +++++++++++++++- linphone-sdk | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 11125c608..14f6bae7d 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -419,7 +419,21 @@ endif() set(INCLUDED_DIRECTORIES "${LINPHONECXX_INCLUDE_DIRS}" ) -set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES}) +set(LIBRARIES_LIST ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES}) +if(WIN32) + set(LIBRARIES) + foreach(LIBRARY ${LIBRARIES_LIST})# Search for lib full path + find_library(FIND_LIBRARY_ITEM_${LIBRARY} NAMES ${LIBRARY} lib${LIBRARY} REQUIRED)#find_library need a specific variable name each time + if(FIND_LIBRARY_ITEM_${LIBRARY}) + list(APPEND LIBRARIES ${FIND_LIBRARY_ITEM_${LIBRARY}}) + else() + message(SEND_ERROR "${LIBRARY} not found!") + endif() + endforeach() +else() + set(LIBRARIES ${LIBRARIES_LIST}) +endif() + if(ENABLE_BUILD_VERBOSE) message("LIBRARIES : ${LIBRARIES}") diff --git a/linphone-sdk b/linphone-sdk index a4860262c..c4dc4ab8d 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit a4860262c70b7a00126757a3be415925fd810eb2 +Subproject commit c4dc4ab8dada2103c3b0c464ddfaa35cff7f4786