Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:kimi:telephony-to-merge
linphoneqt
linphoneqt-0006-plugin-dir.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File linphoneqt-0006-plugin-dir.patch of Package linphoneqt
diff -U 3 -H -d -r -N -- a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,10 +59,17 @@ # Prepare gobal CMAKE configuration specific to the current project set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. -set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}") set(QTKEYCHAIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/qtkeychain") set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") -set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") +set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}") +message(STATUS "Check this: (CMakeLists.txt line 66)") +message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") +message(STATUS "CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}") +message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}") +message(STATUS "LINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +message(STATUS "APPLICATION_OUTPUT_DIR=${APPLICATION_OUTPUT_DIR}") +message(STATUS "MSPLUGINS_DIR=${MSPLUGINS_DIR}") set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}") if(WIN32) diff -U 3 -H -d -r -N -- a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -50,6 +50,11 @@ if(UNIX AND NOT APPLE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) endif() +message(STATUS "Check this: (linphone-app/CMakeLists.txt line 53)") +message(STATUS "MSPLUGINS_DIR=${MSPLUGINS_DIR}") +message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") +message(STATUS "LINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +message(STATUS "CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/lib64/cmake") @@ -618,7 +623,12 @@ set(MSPLUGINS_DIR "Frameworks/mediastreamer2.framework/Versions/A/Libraries") endif() else() - set(MSPLUGINS_DIR "plugins/mediastreamer") + #set(MSPLUGINS_DIR "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") + message(STATUS "Check this: (linphone-app/CMakeLists.txt line 622)") + message(STATUS "MSPLUGINS_DIR=${MSPLUGINS_DIR}") + message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") + message(STATUS "LINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + message(STATUS "CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}") endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") # ------------------------------------------------------------------------------ diff -U 3 -H -d -r -N -- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -134,8 +134,14 @@ install(FILES ${PDB_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}/" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() install(FILES ${EXE_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}/") - file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*") - install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" ) + file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/*") + install(FILES ${PLUGINS_FILES} DESTINATION "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/" ) + message(STATUS "Check this:") + message(STATUS "PLUGINS_FILES=${PLUGINS_FILES}") + message(STATUS "MSPLUGINS_DIR=${MSPLUGINS_DIR}") + message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") + message(STATUS "CMAKE_INSTALL_PREFIX=${LINPHONE_OUTPUT_DIR}") + message(STATUS "CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}") file(GLOB GRAMMAR_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/Belr/grammars/*") install(FILES ${GRAMMAR_FILES} DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/" ) install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/images" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS OPTIONAL) @@ -296,7 +302,7 @@ message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" ) endif() file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*") - install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" ) + install(FILES ${PLUGINS_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/" ) # Install desktop/icon files. configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff -U 3 -H -d -r -N -- a/linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in --- a/linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in +++ b/linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in @@ -4,5 +4,5 @@ lib/mediastreamer_base*.lib lib/mediastreamer_voip*.lib share/doc/mediastreamer2-* -share/images/nowebcamCIF.jpg +share/linphone/images/nowebcamCIF.jpg share/Mediastreamer2/cmake/*
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor