From dea67fa3841d9f55a1ae6831628c3c391ee60e19 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:25:23 -0400 Subject: [PATCH] Build against newer versions of antlr4 (4.13 and 4.13.1) without having to manually specify jar path --- cmake/modules/FindANTLR.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindANTLR.cmake b/cmake/modules/FindANTLR.cmake index 8686c9fe15..9d3f6ae0eb 100644 --- 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}")