Merge pull request #3858 from timkpaine/tkp/antlr4

Build against newer versions of antlr4 (4.13 and 4.13.1) without having to manually specify jar path
chipsalliance · Sep 16, 2023 · 2493853 · 2493853
2 parents 7b65d5a + dea67fa
commit 2493853
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/modules/FindANTLR.cmake b/cmake/modules/FindANTLR.cmake
@@ -12,9 +12,9 @@ find_package(Java QUIET COMPONENTS Runtime)
 # ANTLR JAR HANDLING
 if(NOT ANTLR_JAR_LOCATION)
   find_file(ANTLR_JAR_LOCATION
-            NAMES antlr-4.12.0-complete.jar antlr.jar antlr4.jar antlr-4.jar 
+            NAMES antlr-4.12.0-complete.jar antlr-4.13.0-complete.jar antlr-4.13.1-complete.jar antlr.jar antlr4.jar antlr-4.jar 
             HINTS /usr /usr/local /usr/local/share /usr/local/share/java /usr/local/lib/ /usr/share /usr/share/java /usr/local/Homebrew ~/homebrew /usr/local/homebrew/Cellar /opt/homebrew/Cellar
-            PATH_SUFFIXES antlr 4.12.0 antlr/4.12.0 
+            PATH_SUFFIXES antlr 4.12.0 4.13.0 4.13.1 antlr/4.12.0 antlr/4.13.0 antlr/4.13.1 
             NO_CMAKE_SYSTEM_PATH
             NO_SYSTEM_ENVIRONMENT_PATH)
     message("ANTLR Jar: ${ANTLR_JAR_LOCATION}")