From bd7a6b2fa7d3f7665aaa8089a5bbce683d7e7798 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 28 Nov 2014 10:49:32 +0100 Subject: [PATCH] Improve build with CMake. - Install the GTK UI binary under the name linphone instead of linphone-gtk. - Install all sounds and rings. - Install freedesktop files. --- CMakeLists.txt | 2 ++ gtk/CMakeLists.txt | 1 + share/CMakeLists.txt | 37 ++++++++++++++++++++++++++------ share/audio-assistant.desktop.in | 2 +- share/rings/CMakeLists.txt | 21 ++++++++++++++---- 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1740cc44f..7d91afd8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,8 @@ set(LINPHONE_PLUGINS_DIR "${LINPHONE_DATA_DIR}/lib/liblinphone/plugins") set(PACKAGE_LOCALE_DIR "${LINPHONE_DATA_DIR}/share/locale") set(PACKAGE_DATA_DIR "${LINPHONE_DATA_DIR}/share") set(PACKAGE_SOUND_DIR "${LINPHONE_DATA_DIR}/share/sounds/linphone") +set(PACKAGE_RING_DIR "${PACKAGE_SOUND_DIR}/rings") +set(PACKAGE_FREEDESKTOP_DIR "${PACKAGE_DATA_DIR}/applications") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/config.h PROPERTIES GENERATED ON) add_definitions(-DHAVE_CONFIG_H) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index ae395500d..6bc50e5e9 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -66,6 +66,7 @@ set(SOURCE_FILES ) add_executable(linphone-gtk ${SOURCE_FILES}) +set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone) target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS}) target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES}) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 03b36a74d..0ae15ce76 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -21,12 +21,37 @@ ############################################################################ install(FILES archived-rootca.pem - RENAME rootca.pem - DESTINATION share/linphone - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + RENAME rootca.pem + DESTINATION ${PACKAGE_DATA_DIR}/linphone + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) -install(FILES ringback.wav - DESTINATION share/sounds/linphone - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +set(SOUND_FILES + hello16000.wav + hello8000.wav + incoming_chat.wav + ringback.wav +) + +install(FILES ${SOUND_FILES} + DESTINATION ${PACKAGE_SOUND_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) + +if(ENABLE_GTK_UI) + set(prefix "${CMAKE_INSTALL_PREFIX}") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/audio-assistant.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/audio-assistant.desktop) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.desktop) + + set(FREEDESKTOP_FILES + ${CMAKE_CURRENT_BINARY_DIR}/audio-assistant.desktop + ${CMAKE_CURRENT_BINARY_DIR}/linphone.desktop + ) + + install(FILES ${FREEDESKTOP_FILES} + DESTINATION ${PACKAGE_FREEDESKTOP_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +endif() add_subdirectory(rings) diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in index 8f2ef4c54..dc0734bc6 100644 --- a/share/audio-assistant.desktop.in +++ b/share/audio-assistant.desktop.in @@ -6,6 +6,6 @@ Comment[fr]=Assistant audio de Linphone. Comment[ru]=Помощник аудио Linphone Type=Application Exec=linphone --run-audio-assistant -Icon=/usr/local/share/pixmaps/linphone/linphone.png +Icon=@prefix@/share/pixmaps/linphone/linphone.png Terminal=false Categories=Network;Telephony; \ No newline at end of file diff --git a/share/rings/CMakeLists.txt b/share/rings/CMakeLists.txt index 63f2c47ac..6ec2182e2 100644 --- a/share/rings/CMakeLists.txt +++ b/share/rings/CMakeLists.txt @@ -20,7 +20,20 @@ # ############################################################################ -install(FILES oldphone.wav toy-mono.wav - COMPONENT COMP_liblinphone - DESTINATION share/sounds/linphone/rings - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +set(RING_FILES + bigben.wav + oldphone-mono-30s.caf + oldphone-mono.wav + oldphone.wav + orig.wav + rock.wav + sweet.wav + synth.wav + tapping.wav + toy-mono.wav +) + +install(FILES ${RING_FILES} + DESTINATION ${PACKAGE_RING_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +)