aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel M. Capella <polycitizen@gmail.com>2018-08-07 01:34:11 -0400
committerDaniel M. Capella <polycitizen@gmail.com>2018-08-07 23:17:33 -0400
commit4938066c623fc05f96be6a150a0ef00d1fabb813 (patch)
treec7edbefdeb762799eca2d99be0ab70a73cc5547a
parent86c30dc4fd38722f65f6e06fa024a372933badae (diff)
downloadrazer-4938066c623fc05f96be6a150a0ef00d1fabb813.tar.xz
razer-4938066c623fc05f96be6a150a0ef00d1fabb813.zip
Consolidate UI
Makes it more convenient when packaging the daemon separately from the UI[]. []: https://aur.archlinux.org/cgit/aur.git/commit/?h=razercfg&id=7ce2b3258c916f3e140a8b5dcfe12ff0ae3865da
-rw-r--r--CMakeLists.txt27
-rw-r--r--ui/CMakeLists.txt33
-rw-r--r--ui/icons/LICENSE (renamed from icons/LICENSE)0
-rw-r--r--ui/icons/razercfg-alt.svg (renamed from icons/razercfg-alt.svg)0
-rw-r--r--ui/icons/razercfg-icon.svg (renamed from icons/razercfg-icon.svg)0
-rw-r--r--ui/icons/razercfg-snake.svg (renamed from icons/razercfg-snake.svg)0
-rw-r--r--ui/razercfg.desktop.template (renamed from razercfg.desktop.template)0
7 files changed, 30 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 142690f..1427bfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,32 +54,5 @@ if(SYSTEMD_UNIT_DIR)
WORLD_READ)
endif(SYSTEMD_UNIT_DIR)
-configure_file("razercfg.desktop.template" "razercfg.desktop")
-
-install(FILES ${CMAKE_BINARY_DIR}/razercfg.desktop
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/
- PERMISSIONS OWNER_READ OWNER_WRITE
- GROUP_READ
- WORLD_READ)
-
-install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-icon.svg
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
- RENAME razercfg.svg
- PERMISSIONS OWNER_READ OWNER_WRITE
- GROUP_READ
- WORLD_READ)
-
-install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-alt.svg
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
- PERMISSIONS OWNER_READ OWNER_WRITE
- GROUP_READ
- WORLD_READ)
-
-install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-snake.svg
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
- PERMISSIONS OWNER_READ OWNER_WRITE
- GROUP_READ
- WORLD_READ)
-
add_subdirectory(razerd)
add_subdirectory(ui)
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 96a092a..ed785a5 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -7,8 +7,7 @@ set(PYRAZER_DEPS "${CMAKE_CURRENT_SOURCE_DIR}/pyrazer/__init__.py"
set(PYRAZER_BUILD "${CMAKE_CURRENT_SOURCE_DIR}/build")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in"
- "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
+configure_file("setup.py.in" "${CMAKE_BINARY_DIR}/setup.py")
add_custom_command(OUTPUT ${PYRAZER_BUILD}/stamp
COMMAND ${PYTHON} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" build -b "${PYRAZER_BUILD}"
@@ -24,7 +23,7 @@ install(CODE
if (\"\${PYDESTDIR}\" STREQUAL \"\")
set(PYDESTDIR /)
endif()
- execute_process(COMMAND ${PYTHON} \"${CMAKE_CURRENT_SOURCE_DIR}/setup.py\"
+ execute_process(COMMAND ${PYTHON} \"${CMAKE_BINARY_DIR}/setup.py\"
install --root \"\${PYDESTDIR}\" --prefix \"${CMAKE_INSTALL_PREFIX}\"
WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\"
RESULT_VARIABLE pyrazer_install_res)
@@ -35,3 +34,31 @@ install(CODE
install(PROGRAMS razer-gamewrapper
DESTINATION bin)
+
+configure_file("razercfg.desktop.template"
+ "${CMAKE_BINARY_DIR}/razercfg.desktop")
+
+install(FILES ${CMAKE_BINARY_DIR}/razercfg.desktop
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/
+ PERMISSIONS OWNER_READ OWNER_WRITE
+ GROUP_READ
+ WORLD_READ)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-icon.svg
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
+ RENAME razercfg.svg
+ PERMISSIONS OWNER_READ OWNER_WRITE
+ GROUP_READ
+ WORLD_READ)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-alt.svg
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
+ PERMISSIONS OWNER_READ OWNER_WRITE
+ GROUP_READ
+ WORLD_READ)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-snake.svg
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/
+ PERMISSIONS OWNER_READ OWNER_WRITE
+ GROUP_READ
+ WORLD_READ)
diff --git a/icons/LICENSE b/ui/icons/LICENSE
index 843f03e..843f03e 100644
--- a/icons/LICENSE
+++ b/ui/icons/LICENSE
diff --git a/icons/razercfg-alt.svg b/ui/icons/razercfg-alt.svg
index 705e63f..705e63f 100644
--- a/icons/razercfg-alt.svg
+++ b/ui/icons/razercfg-alt.svg
diff --git a/icons/razercfg-icon.svg b/ui/icons/razercfg-icon.svg
index dbb4a7e..dbb4a7e 100644
--- a/icons/razercfg-icon.svg
+++ b/ui/icons/razercfg-icon.svg
diff --git a/icons/razercfg-snake.svg b/ui/icons/razercfg-snake.svg
index 75882ab..75882ab 100644
--- a/icons/razercfg-snake.svg
+++ b/ui/icons/razercfg-snake.svg
diff --git a/razercfg.desktop.template b/ui/razercfg.desktop.template
index bce227f..bce227f 100644
--- a/razercfg.desktop.template
+++ b/ui/razercfg.desktop.template
bues.ch cgit interface