File tree Expand file tree Collapse file tree 4 files changed +15
-7
lines changed Expand file tree Collapse file tree 4 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -103,6 +103,8 @@ if (ENABLE_GUI)
103103 add_subdirectory (gui)
104104endif ()
105105
106+ include (GNUInstallDirs)
107+
106108# Install the header files into include/
107109install (FILES include /tic.h include /tic.hpp include /tic_protocol.h
108- DESTINATION "include /libpololu-tic-${SOFTWARE_VERSION_MAJOR} " )
110+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR} /libpololu-tic-${SOFTWARE_VERSION_MAJOR} " )
Original file line number Diff line number Diff line change @@ -20,4 +20,6 @@ include_directories (
2020
2121target_link_libraries (cli lib)
2222
23- install (TARGETS cli DESTINATION bin)
23+ include (GNUInstallDirs)
24+
25+ install (TARGETS cli DESTINATION ${CMAKE_INSTALL_BINDIR} )
Original file line number Diff line number Diff line change @@ -52,4 +52,6 @@ endif ()
5252
5353target_link_libraries (gui Qt5::Widgets lib bootloader)
5454
55- install (TARGETS gui DESTINATION bin)
55+ include (GNUInstallDirs)
56+
57+ install (TARGETS gui DESTINATION ${CMAKE_INSTALL_BINDIR} )
Original file line number Diff line number Diff line change @@ -73,10 +73,12 @@ configure_file (
7373 @ONLY
7474)
7575
76+ include (GNUInstallDirs)
77+
7678install (FILES "${CMAKE_CURRENT_BINARY_DIR} /libpololu-tic-${SOFTWARE_VERSION_MAJOR} .pc"
77- DESTINATION lib /pkgconfig)
79+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /pkgconfig)
7880
7981install (TARGETS lib
80- RUNTIME DESTINATION bin
81- LIBRARY DESTINATION lib
82- ARCHIVE DESTINATION lib )
82+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
83+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
84+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
You can’t perform that action at this time.
0 commit comments