Browse Source

made library static

Malte Veerman 10 years ago
parent
commit
0f97f75854
2 changed files with 8 additions and 7 deletions
  1. 3 3
      fancontrol-gui/CMakeLists.txt
  2. 5 4
      share/CMakeLists.txt

+ 3 - 3
fancontrol-gui/CMakeLists.txt

@@ -1,10 +1,10 @@
 set(Fancontrol-GUI_SRCS src/main.cpp)
 
 add_executable(fancontrol-gui ${Fancontrol-GUI_SRCS} ${RESOURCES})
-target_link_libraries(fancontrol-gui LINK_PUBLIC fancontrol-gui-lib)
+target_link_libraries(fancontrol-gui fancontrol-gui-lib)
 set_property(TARGET fancontrol-gui PROPERTY CXX_STANDARD 11)
 
 install(TARGETS fancontrol-gui RUNTIME DESTINATION bin)
-install(FILES other/fancontrol-gui.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+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 ${CMAKE_INSTALL_PREFIX}/share/fancontrol-gui/qml)
+install(FILES qml/fancontrol-gui.qml DESTINATION share/fancontrol-gui/qml)

+ 5 - 4
share/CMakeLists.txt

@@ -24,10 +24,11 @@ endif(NO_SYSTEMD)
 
 add_definitions(-DFANCONTROL_GUI_LIBRARY)
 
-add_library(fancontrol-gui-lib ${LIB_SRCS})
+add_library(fancontrol-gui-lib STATIC ${LIB_SRCS})
 
 target_link_libraries(fancontrol-gui-lib ${LIBRARIES})
-target_include_directories (fancontrol-gui-lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-install(DIRECTORY qml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fancontrol-gui)
-install(DIRECTORY javascript DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fancontrol-gui)
+install(DIRECTORY qml DESTINATION share/fancontrol-gui)
+install(DIRECTORY javascript DESTINATION share/fancontrol-gui)
+#install(TARGETS fancontrol-gui-lib DESTINATION lib/fancontrol-gui EXPORT fancontrol-gui-lib-targets)
+#install(EXPORT fancontrol-gui-lib-targets DESTINATION lib/fancontrol-gui)