Revert "Rename gnome-ring to ring-gnome"
Reverting until further discussion.
This reverts commit c634cbec7d5ef2e67a2948c6ec75e889d3c432ce.
Tuleap: #764
Change-Id: Ie7a47859b7103817208da416623f2a3e225f5eb9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56640ed..7090cd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,12 +337,12 @@
# install and compile glib gsettings schema
add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)
-ADD_EXECUTABLE(ring-gnome ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
+ADD_EXECUTABLE(gnome-ring ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
-ADD_DEPENDENCIES(ring-gnome libqrencode)
+ADD_DEPENDENCIES(gnome-ring libqrencode)
IF(NOT ${ENABLE_STATIC} MATCHES false)
-TARGET_LINK_LIBRARIES(ring-gnome
+TARGET_LINK_LIBRARIES(gnome-ring
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
@@ -356,7 +356,7 @@
-lqrencode
)
ELSE()
-TARGET_LINK_LIBRARIES(ring-gnome
+TARGET_LINK_LIBRARIES(gnome-ring
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
@@ -381,34 +381,34 @@
"${PROJECT_BINARY_DIR}/config.h"
)
-INSTALL(TARGETS ring-gnome
+INSTALL(TARGETS gnome-ring
RUNTIME DESTINATION bin
)
# install .desktop in XDG desktop dir so that it is recognized by the system
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/ring-gnome.desktop
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
)
-# install .desktop in the ring-gnome data dir, so that it can be copied to the
+# install .desktop in the gnome-ring data dir, so that it can be copied to the
# autostart dir by the client
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/ring-gnome.desktop.autostart
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
DESTINATION
- ${CMAKE_INSTALL_PREFIX}/share/ring-gnome/
+ ${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
PERMISSIONS
WORLD_READ
OWNER_WRITE
OWNER_READ
GROUP_READ
RENAME
- ring-gnome.desktop
+ gnome-ring.desktop
)
INSTALL(FILES pixmaps/ring.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
)
-INSTALL(FILES ring-gnome.appdata.xml
+INSTALL(FILES gnome-ring.appdata.xml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/
)