Skip to content

cpp/cmake: Fix library install directories #3447

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

Merged
parrt merged 1 commit into from
Jan 2, 2022
Merged

cpp/cmake: Fix library install directories #3447

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
3 changes: 2 additions & 1 deletion contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,5 @@ YYYY/MM/DD, github id, Full name, email
2021/11/30, bollwyvl, Nick Bollweg, bollwyvl@users.noreply.github.com
2021/12/03, eneko, Eneko Alonso, eneko.alonso@gmail.com
2021/12/16, Ketler13, Oleksandr Martyshchenko, oleksandr.martyshchenko@gmail.com
2021/12/25, Tinker1024, Tinker1024, tinker@huawei.com
2021/12/25, Tinker1024, Tinker1024, tinker@huawei.com
2021/12/31, Biswa96, Biswapriyo Nath, nathbappai@gmail.com
13 changes: 9 additions & 4 deletions runtime/Cpp/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,16 @@ set_target_properties(antlr4_static
COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")

install(TARGETS antlr4_shared
DESTINATION lib
EXPORT antlr4-targets)
EXPORT antlr4-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

install(TARGETS antlr4_static
DESTINATION lib
EXPORT antlr4-targets)
EXPORT antlr4-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
DESTINATION "include/antlr4-runtime"
Expand Down