From 95245907392fa643fe2619df69c7c353385fc49b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 17 Jan 2019 10:38:39 +0100 Subject: [PATCH] fix(package): install correctly rootca.pem on Windows when executable name is not linphone --- cmake_builder/linphone_package/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index cb309fbb3..209dfed9a 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -160,7 +160,7 @@ if (WIN32) ) file(GLOB SHARE_CONTENT RELATIVE "${LINPHONE_OUTPUT_DIR}" "${LINPHONE_OUTPUT_DIR}/share/*") - list(REMOVE_ITEM SHARE_CONTENT "share/belr" "share/Belr" "share/images" "share/${EXECUTABLE_NAME}" "share/${APPLICATION_NAME}" "share/sounds") + list(REMOVE_ITEM SHARE_CONTENT "share/belr" "share/Belr" "share/images" "share/${APPLICATION_NAME}" "share/${EXECUTABLE_NAME}" "share/sounds") foreach (ITEM IN LISTS SHARE_CONTENT) list(APPEND SHARE_CONTENT_EXCLUDE PATTERN "${ITEM}" EXCLUDE) endforeach () @@ -182,11 +182,13 @@ if (WIN32) PATTERN "lib/pkgconfig" EXCLUDE PATTERN "lib/Win32" EXCLUDE PATTERN "${EXECUTABLE_NAME}.lnk" EXCLUDE - PATTERN "share/Belr/cmake" EXCLUDE PATTERN "share/${APPLICATION_NAME}/cmake" EXCLUDE + PATTERN "share/Belr/cmake" EXCLUDE ${SHARE_CONTENT_EXCLUDE} ) + install(FILES "${LINPHONE_OUTPUT_DIR}/share/Linphone/rootca.pem" DESTINATION "share/${EXECUTABLE_NAME}") + if (ENABLE_OPENH264) install(FILES "${LINPHONE_OUTPUT_DIR}/lib/mediastreamer/plugins/libmsopenh264.dll" DESTINATION "lib/mediastreamer/plugins"