mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Repair master SDK build by using find_library in Windows to select path file from SDK libraries

Browse source 
Update SDK
This commit is contained in:
Julien Wadel 2020-08-03 16:05:39 +02:00
parent dd0432c18d
commit 9fb5ead0fd
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
linphone-app/CMakeLists.txt
View file

@ -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}")

2
linphone-sdk

@ -1 +1 @@
Subproject commit a4860262c70b7a00126757a3be415925fd810eb2
Subproject commit c4dc4ab8dada2103c3b0c464ddfaa35cff7f4786