Fix cmake find_package

This commit is contained in:
Nicolas Michon 2019-09-20 17:31:57 +02:00
parent 49297e4329
commit 281f6b693b
2 changed files with 7 additions and 13 deletions

4
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "submodules/externals/minizip"]
path = submodules/externals/minizip
url = https://gitlab.linphone.org/BC/public/external/minizip.git
url = ../../public/external/minizip.git
[submodule "linphone-sdk"]
path = linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
url = ../../public/linphone-sdk.git

View file

@ -97,17 +97,11 @@ set(QT5_PACKAGES_OPTIONAL TextToSpeech)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if (LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_linphone_CONFIG_DIR}/wrappers/cpp/LinphoneCxxConfig.cmake")
include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake")
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
else ()
find_package(LinphoneCxx REQUIRED)
find_package(BcToolbox REQUIRED)
find_package(Belcard REQUIRED)
find_package(Mediastreamer2 REQUIRED)
endif ()
find_package(LinphoneCxx CONFIG REQUIRED)
find_package(bctoolbox CONFIG REQUIRED)
find_package(belcard CONFIG REQUIRED)
find_package(Mediastreamer2 CONFIG REQUIRED)
find_package(Minizip REQUIRED)
set(SOURCES