Skip to content
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

Jump to bottom

Statically build and link the ANTLR4 runtime. #41

Merged
merged 12 commits into from
Dec 17, 2020
Merged

Statically build and link the ANTLR4 runtime. #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8530708
Statically build and link the ANTLR4 runtime.
HackerFoo Dec 15, 2020
cd6a089
Use a submodule for third_party/antlr4
HackerFoo Dec 16, 2020
94ea28b
Set CFLAGS=-fPIC
HackerFoo Dec 16, 2020
261aee8
Add an option to build with a shared library.
HackerFoo Dec 16, 2020
e030368
Format Python.
HackerFoo Dec 16, 2020
55191b5
Make requested changes.
HackerFoo Dec 16, 2020
98a83ad
Add --antlr-runtime flag to build, develop, and install commands.
HackerFoo Dec 16, 2020
9c94e5b
Prevent conflicts in shared options.
HackerFoo Dec 17, 2020
9b70ddb
Fix typo.
HackerFoo Dec 17, 2020
540e905
Add documentation on `--no-use-pep517`.
HackerFoo Dec 17, 2020
09a7325
Use pip install for tox tests.
HackerFoo Dec 17, 2020
7afe696
Add comments.
HackerFoo Dec 17, 2020
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
8 changes: 7 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/antlr4/

set(CMAKE_CXX_STANDARD 11)

# required if linking to static library
add_definitions(-DANTLR4CPP_STATIC)

# add external build for antlrcpp
include(ExternalAntlr4Cpp)

# add antrl4cpp artifacts to project environment
include_directories(${ANTLR4_INCLUDE_DIRS})

Expand All @@ -25,7 +31,7 @@ set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/antlr4/antlr-4.9
# add macros to generate ANTLR Cpp code from grammar
find_package(ANTLR REQUIRED)

find_library(ANTLR4_RUNTIME NAMES antlr4-runtime REQUIRED)
set(ANTLR4_RUNTIME antlr4_static)

# Unit testing library
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../third_party/googletest EXCLUDE_FROM_ALL googletest)
Expand Down
5 changes: 3 additions & 2 deletions third_party/antlr4/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ endif()
if(${CMAKE_GENERATOR} MATCHES ".* Makefiles")
# This avoids
# 'warning: jobserver unavailable: using -j1. Add '+' to parent make rule.'
set(ANTLR4_BUILD_COMMAND $(MAKE))
set(ANTLR4_BUILD_COMMAND $(MAKE) CXX_FLAGS="-fPIC" C_FLAGS="-fPIC")
HackerFoo marked this conversation as resolved.
Show resolved Hide resolved
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
set(ANTLR4_BUILD_COMMAND
${CMAKE_COMMAND}
Expand All @@ -68,7 +68,8 @@ else()
set(ANTLR4_BUILD_COMMAND
${CMAKE_COMMAND}
--build .
--target)
--target
-DCMAKE_POSITION_INDEPENDENT_CODE=ON)
endif()

if(NOT DEFINED ANTLR4_WITH_STATIC_CRT)
Expand Down