Browse Source

updated some install dirs

Malte Veerman 10 years ago
parent
commit
bf0ac640ac
2 changed files with 9 additions and 9 deletions
  1. 4 4
      fancontrol-gui/CMakeLists.txt
  2. 5 5
      share/CMakeLists.txt

+ 4 - 4
fancontrol-gui/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(fancontrol-gui ${Fancontrol-GUI_SRCS} ${RESOURCES})
 target_link_libraries(fancontrol-gui ${LIBRARIES})
 set_property(TARGET fancontrol-gui PROPERTY CXX_STANDARD 11)
 
-install(TARGETS fancontrol-gui RUNTIME DESTINATION bin)
-install(FILES other/fancontrol-gui.desktop DESTINATION share/applications)
-install(FILES other/fancontrol-gui.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps)
-install(FILES qml/fancontrol-gui.qml DESTINATION share/fancontrol-gui/qml)
+install(TARGETS fancontrol-gui RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+install(FILES other/fancontrol-gui.desktop DESTINATION "${SHARE_INSTALL_PREFIX}/applications")
+install(FILES other/fancontrol-gui.svg DESTINATION "${ICON_INSTALL_DIR}/hicolor/scalable/apps")
+install(FILES qml/fancontrol-gui.qml DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui/qml")

+ 5 - 5
share/CMakeLists.txt

@@ -36,8 +36,8 @@ add_library(fancontrol-gui-share ${LIB_SRCS})
 
 target_link_libraries(fancontrol-gui-share ${LIBRARIES})
 
-install(DIRECTORY qml DESTINATION share/fancontrol-gui)
-install(DIRECTORY javascript DESTINATION share/fancontrol-gui)
-install(FILES ${LIB_HEADER} DESTINATION lib/fancontrol-gui/include)
-install(TARGETS fancontrol-gui-share DESTINATION lib EXPORT libfancontrol-gui-share-targets)
-install(EXPORT libfancontrol-gui-share-targets DESTINATION lib/fancontrol-gui)
+install(DIRECTORY qml DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
+install(DIRECTORY javascript DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
+install(FILES ${LIB_HEADER} DESTINATION "${LIB_INSTALL_DIR}/fancontrol-gui/include")
+install(TARGETS fancontrol-gui-share DESTINATION ${LIB_INSTALL_DIR} EXPORT libfancontrol-gui-share-targets)
+install(EXPORT libfancontrol-gui-share-targets DESTINATION "${LIB_INSTALL_DIR}/fancontrol-gui")