From c951ef647adc8854367c893b56b6f25d6f9667b1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 11 Oct 2023 14:41:50 +0200 Subject: [PATCH] Deployment fix and project configuration improvement --- Linphone/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt index cf10b1c94..04e8ee610 100644 --- a/Linphone/CMakeLists.txt +++ b/Linphone/CMakeLists.txt @@ -96,6 +96,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES MACOSX_BUNDLE TRUE WIN32_EXECUTABLE TRUE OUTPUT_NAME "${EXECUTABLE_NAME}" +# Added for Qt to set the correct path on run configurations. + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" ) if(MSVC) set_target_properties(${TARGET_NAME} PROPERTIES PDB_NAME "${EXECUTABLE_NAME}_app") @@ -114,6 +118,11 @@ endforeach() # INSTALL ################################################################ + install(TARGETS ${TARGET_NAME} BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/assistant" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}" + USE_SOURCE_PERMISSIONS)