Skip to content

Use standard install dirs #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use standard install dirs #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ if (ENABLE_GUI)
add_subdirectory (gui)
endif ()

include(GNUInstallDirs)

# Install the header files into include/
install(FILES include/tic.h include/tic.hpp include/tic_protocol.h
DESTINATION "include/libpololu-tic-${SOFTWARE_VERSION_MAJOR}")
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libpololu-tic-${SOFTWARE_VERSION_MAJOR}")
4 changes: 3 additions & 1 deletion cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ include_directories (

target_link_libraries (cli lib)

install(TARGETS cli DESTINATION bin)
include(GNUInstallDirs)

install(TARGETS cli DESTINATION ${CMAKE_INSTALL_BINDIR})
4 changes: 3 additions & 1 deletion gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@ endif ()

target_link_libraries (gui Qt5::Widgets lib bootloader)

install(TARGETS gui DESTINATION bin)
include(GNUInstallDirs)

install(TARGETS gui DESTINATION ${CMAKE_INSTALL_BINDIR})
10 changes: 6 additions & 4 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ configure_file (
@ONLY
)

include(GNUInstallDirs)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpololu-tic-${SOFTWARE_VERSION_MAJOR}.pc"
DESTINATION lib/pkgconfig)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

install(TARGETS lib
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})