From: Andrew V. Jones <andrewvaughanj@gmail.com>
Date: Sat, 27 Mar 2021 19:12:28 +0000 (+0000)
Subject: When building ANTLR via CMake, do not require javac #6224 (#6225)
X-Git-Tag: cvc5-1.0.0~2022
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f5fcab6661ccd1c64c0bd8ce1bba44f61702be2;p=cvc5.git

When building ANTLR via CMake, do not require javac #6224 (#6225)

As title; attempts to correct #6224.

Signed-off-by: Andrew V. Jones andrewvaughanj@gmail.com
---

diff --git a/cmake/FindANTLR3.cmake b/cmake/FindANTLR3.cmake
index 2ca66ff0b..58ba1cf65 100644
--- a/cmake/FindANTLR3.cmake
+++ b/cmake/FindANTLR3.cmake
@@ -95,7 +95,7 @@ if(NOT ANTLR3_FOUND_SYSTEM)
         BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libantlr3c.a
     )
 
-    find_package(Java REQUIRED)
+    find_package(Java COMPONENTS Runtime REQUIRED)
     set(ANTLR3_BINARY ${Java_JAVA_EXECUTABLE}
         -cp "${DEPS_BASE}/share/java/antlr-3.4-complete.jar" org.antlr.Tool)
     set(ANTLR3_INCLUDE_DIR "${DEPS_BASE}/include/")