From 0547b5b99821bec7d6e2e957cc1d8029a2246752 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 8 Dec 2014 10:34:41 +0100 Subject: [PATCH] Handle search for sqlite3 dependency when searching for liblinphone when building with CMake. --- CMakeLists.txt | 4 +++- cmake/{FindLinphone.cmake => FindLinphone.cmake.in} | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) rename cmake/{FindLinphone.cmake => FindLinphone.cmake.in} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 390812533..f1664f68d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,9 @@ if(ENABLE_UNIT_TESTS) endif() -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLinphone.cmake +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLinphone.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindLinphone.cmake) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindLinphone.cmake DESTINATION share/cmake/Modules PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) diff --git a/cmake/FindLinphone.cmake b/cmake/FindLinphone.cmake.in similarity index 92% rename from cmake/FindLinphone.cmake rename to cmake/FindLinphone.cmake.in index 065e1c865..5f8b03b19 100644 --- a/cmake/FindLinphone.cmake +++ b/cmake/FindLinphone.cmake.in @@ -32,6 +32,9 @@ find_package(ORTP REQUIRED) find_package(MS2 REQUIRED) find_package(XML2 REQUIRED) find_package(BelleSIP REQUIRED) +if(@ENABLE_MSG_STORAGE@) + find_package(Sqlite3) +endif() set(_LINPHONE_ROOT_PATHS ${WITH_LINPHONE} @@ -56,6 +59,12 @@ find_library(LINPHONE_LIBRARIES list(APPEND LINPHONE_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${MS2_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS}) list(APPEND LINPHONE_LIBRARIES ${ORTP_LIBRARIES} ${MS2_LIBRARIES} ${XML2_LIBRARIES} ${BELLESIP_LIBRARIES}) + +if(SQLITE3_FOUND) + list(APPEND LINPHONE_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIRS}) + list(APPEND LINPHONE_LIBRARIES ${SQLITE3_LIBRARIES}) +endif() + if(WIN32) list(APPEND LINPHONE_LIBRARIES shlwapi) endif(WIN32)