Skip to content

Commit

Permalink
cpp/cmake: Fix library install directories (#3447)
Browse files Browse the repository at this point in the history
This installs DLLs in bin directory instead of lib.
  • Loading branch information
Biswa96 authored Jan 2, 2022
1 parent 156cffb commit 726983d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
3 changes: 2 additions & 1 deletion contributors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -326,4 +326,5 @@ YYYY/MM/DD, github id, Full name, email
2021/11/30, bollwyvl, Nick Bollweg, [email protected]
2021/12/03, eneko, Eneko Alonso, [email protected]
2021/12/16, Ketler13, Oleksandr Martyshchenko, [email protected]
2021/12/25, Tinker1024, Tinker1024, [email protected]
2021/12/25, Tinker1024, Tinker1024, [email protected]
2021/12/31, Biswa96, Biswapriyo Nath, [email protected]
13 changes: 9 additions & 4 deletions runtime/Cpp/runtime/CMakeLists.txt
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

0 comments on commit 726983d

Please sign in to comment.