Merge pull request #9 from s0dyy/main

Use CMAKE_INSTALL_BINDIR instead of hardcoded path
4 years ago · 0acfe3b212
parent 065c4006fb 37ed57db67
commit 0acfe3b212
11 changed files with 12 additions and 12 deletions
--- a/README.md
+++ b/README.md
@ -26,7 +26,7 @@ pulseaudio
 ```shell
 mkdir build
 cd build
-cmake ..
+cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
 make
 ```

--- a/chotkeys/CMakeLists.txt
+++ b/chotkeys/CMakeLists.txt
@ -17,4 +17,4 @@ target_link_libraries(chotkeys
    KF5::GlobalAccel
 )

-install(TARGETS chotkeys RUNTIME DESTINATION /usr/bin)
+install(TARGETS chotkeys RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/cpufreq/CMakeLists.txt
+++ b/cpufreq/CMakeLists.txt
@ -13,5 +13,5 @@ target_link_libraries(${TARGET}
        Qt5::X11Extras
 )

-install(TARGETS ${TARGET} DESTINATION /usr/bin)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES org.cutefish.cpufreq.pkexec.policy DESTINATION /usr/share/polkit-1/actions/)
--- a/cupdatecursor/CMakeLists.txt
+++ b/cupdatecursor/CMakeLists.txt
@ -14,4 +14,4 @@ target_link_libraries(cupdatecursor
    X11::Xcursor
 )

-install(TARGETS cupdatecursor DESTINATION /usr/bin)
+install(TARGETS cupdatecursor DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/polkit-agent/CMakeLists.txt
+++ b/polkit-agent/CMakeLists.txt
@ -35,7 +35,7 @@ add_custom_target(polkit-agent-translations DEPENDS ${QM_FILES} SOURCES ${TS_FIL
 add_dependencies(cutefish-polkit-agent polkit-agent-translations)

 install(TARGETS cutefish-polkit-agent
-    DESTINATION /usr/bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
    COMPONENT Runtime
 )

@ -45,4 +45,4 @@ cutefish-polkit-agent.desktop
    COMPONENT Runtime
 )

-install(FILES ${QM_FILES} DESTINATION /usr/share/cutefish-polkit-agent/translations)
+install(FILES ${QM_FILES} DESTINATION /usr/share/cutefish-polkit-agent/translations)
--- a/powerman/CMakeLists.txt
+++ b/powerman/CMakeLists.txt
@ -24,4 +24,4 @@ target_link_libraries(${TARGET}
        Qt5::X11Extras
 )

-install(TARGETS ${TARGET} DESTINATION /usr/bin)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/screen-brightness/CMakeLists.txt
+++ b/screen-brightness/CMakeLists.txt
@ -17,5 +17,5 @@ target_link_libraries(${PROJECT_NAME}
        Qt5::Widgets
 )

-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION /usr/bin)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES org.cutefish.brightness.pkexec.policy DESTINATION /usr/share/polkit-1/actions/)
--- a/session/CMakeLists.txt
+++ b/session/CMakeLists.txt
@ -30,5 +30,5 @@ target_link_libraries(${TARGET}
        KF5::WindowSystem
 )

-install(TARGETS ${TARGET} DESTINATION /usr/bin)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES cutefish-xsession.desktop DESTINATION /usr/share/xsessions/)
--- a/settings-daemon/CMakeLists.txt
+++ b/settings-daemon/CMakeLists.txt
@ -72,5 +72,5 @@ qt5_create_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
 add_dependencies(${TARGET} translations)

-install(TARGETS ${TARGET} DESTINATION /usr/bin)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${QM_FILES} DESTINATION /usr/share/${TARGET}/translations)
--- a/shutdown-ui/CMakeLists.txt
+++ b/shutdown-ui/CMakeLists.txt
@ -20,4 +20,4 @@ add_custom_target(shutdown-translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
 add_dependencies(cutefish-shutdown shutdown-translations)
 install(FILES ${QM_FILES} DESTINATION /usr/share/cutefish-shutdown/translations)

-install(TARGETS cutefish-shutdown RUNTIME DESTINATION /usr/bin)
+install(TARGETS cutefish-shutdown RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/xembed-sni-proxy/CMakeLists.txt
+++ b/xembed-sni-proxy/CMakeLists.txt
@ -76,4 +76,4 @@ target_link_libraries(cutefish-xembedsniproxy
    ${X11_XTest_LIB}
 )

-install(TARGETS cutefish-xembedsniproxy DESTINATION /usr/bin)
+install(TARGETS cutefish-xembedsniproxy DESTINATION ${CMAKE_INSTALL_BINDIR})