From d8a8849ff0840debef2f96f5e203f478324c57c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 19 Jan 2017 17:16:25 +0100 Subject: [PATCH] Fix some issues in the building scripts of the C++ wrapper --- wrappers/cpp/CMakeLists.txt | 2 +- wrappers/cpp/c_make_lists.mustache.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt index bd458ce75..f803f15c4 100644 --- a/wrappers/cpp/CMakeLists.txt +++ b/wrappers/cpp/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_command(OUTPUT CMakeLists.txt include/linphone.hh "${CMAKE_CURRENT_BINARY_DIR}/c_make_lists.mustache" ) add_custom_target(make_cpp_wrapper ALL ${CMAKE_COMMAND} -E make_directory build/ - COMMAND ${CMAKE_COMMAND} -E chdir build/ ${CMAKE_COMMAND} .. -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + COMMAND ${CMAKE_COMMAND} -E chdir build/ ${CMAKE_COMMAND} .. -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_RPATH="${CMAKE_INSTALL_RPATH}" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} COMMAND ${CMAKE_COMMAND} --build build/ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/include/linphone.hh diff --git a/wrappers/cpp/c_make_lists.mustache.in b/wrappers/cpp/c_make_lists.mustache.in index 9484d28f0..74952207e 100644 --- a/wrappers/cpp/c_make_lists.mustache.in +++ b/wrappers/cpp/c_make_lists.mustache.in @@ -26,6 +26,7 @@ target_link_libraries(linphone++ PRIVATE @PROJECT_BINARY_DIR@/coreapi/liblinphon target_include_directories(linphone++ PUBLIC include PRIVATE @PROJECT_SOURCE_DIR@/include + PRIVATE @BELLESIP_INCLUDE_DIRS@ ) set_target_properties(linphone++ PROPERTIES SOVERSION @LINPHONE_SO_VERSION@