Use a submodule for third_party/antlr4

Signed-off-by: Dusty DeWeese <[email protected]>
chipsalliance · Dec 16, 2020 · cc684d0 · cc684d0
1 parent 8530708
commit cc684d0
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 472 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest.git
+[submodule "third_party/antlr4"]
+	path = third_party/antlr4
+	url = https://github.com/HackerFoo/antlr4.git
+	branch = fpic
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -27,7 +27,7 @@ prune docs/env
 
 include src/*
 include src/antlr/*
-recursive-include third_party *
+graft third_party
 global-exclude .git
 exclude .gitmodules
 exclude .clang-format

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,6 +18,9 @@ set(CMAKE_CXX_STANDARD 11)
 # required if linking to static library
 add_definitions(-DANTLR4CPP_STATIC)
 
+# To build a shared library
+set(ANTLR4_POSITION_INDEPENDENT_CODE ON)
+
 # add external build for antlrcpp
 include(ExternalAntlr4Cpp)
 
@@ -26,7 +29,7 @@ include_directories(${ANTLR4_INCLUDE_DIRS})
 
 # set variable pointing to the antlr tool that supports C++
 # this is not required if the jar file can be found under PATH environment
-set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/antlr4/antlr-4.9-complete.jar)
+set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/antlr4_lib/antlr-4.9-complete.jar)
 
 # add macros to generate ANTLR Cpp code from grammar
 find_package(ANTLR REQUIRED)

diff --git a/third_party/antlr4 b/third_party/antlr4
diff --git a/third_party/antlr4/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/third_party/antlr4/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
diff --git a/third_party/antlr4/runtime/Cpp/cmake/FindANTLR.cmake b/third_party/antlr4/runtime/Cpp/cmake/FindANTLR.cmake