فهرست منبع

bugfix and minor changes to the build system

Malte Veerman 10 سال پیش
والد
کامیت
70f57026e9
4فایلهای تغییر یافته به همراه5 افزوده شده و 9 حذف شده
  1. 2 6
      CMakeLists.txt
  2. 1 1
      fancontrol-gui/CMakeLists.txt
  3. 1 1
      kcm/CMakeLists.txt
  4. 1 1
      lib/CMakeLists.txt

+ 2 - 6
CMakeLists.txt

@@ -94,10 +94,6 @@ if(INSTALL_SHARED)
 
 
     #translations
-    if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-    
-	ki18n_install(po)
-	
-    endif (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-    
+    ki18n_install(po)
+	    
 endif(INSTALL_SHARED)

+ 1 - 1
fancontrol-gui/CMakeLists.txt

@@ -15,5 +15,5 @@ add_definitions(${Qt5Widgets_DEFINITIONS})
 add_executable(fancontrol_gui ${Fancontrol_GUI_SRCS})
 target_link_libraries(fancontrol_gui ${LIBRARIES})
 
-install(TARGETS fancontrol_gui RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS fancontrol_gui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES metadata.desktop RENAME "fancontrol_gui.desktop" DESTINATION ${XDG_APPS_INSTALL_DIR})

+ 1 - 1
kcm/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(kcm_fancontrol MODULE src/fancontrolkcm.cpp)
                                   
 target_link_libraries(kcm_fancontrol ${LIBRARIES})
 
-install(TARGETS kcm_fancontrol DESTINATION "${PLUGIN_INSTALL_DIR}/kcms")
+install(TARGETS kcm_fancontrol DESTINATION "${LIB_INSTALL_DIR}/qt/plugins/kcms")
 install(FILES kcm_fancontrol.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 kcoreaddons_desktop_to_json(kcm_fancontrol "kcm_fancontrol.desktop")

+ 1 - 1
lib/CMakeLists.txt

@@ -30,6 +30,6 @@ generate_export_header(fancontrol_gui_lib)
 
 if(INSTALL_SHARED)
 
-    install(TARGETS fancontrol_gui_lib LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+    install(TARGETS fancontrol_gui_lib ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
     
 endif(INSTALL_SHARED)