6 files changed, 11 insertions, 5 deletions
diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
index 6a7f77ea3..52fa55f9d 100644
--- a/src/parser/CMakeLists.txt
+++ b/src/parser/CMakeLists.txt
@@ -23,6 +23,12 @@ set(cvc4parser_src_files
   parser_exception.h
 )
 
+set(ANTLR_HOME ${ANTLR_DIR})
+find_package(ANTLR REQUIRED)
+
+# Java runtime is required for ANTLR
+find_package(Java COMPONENTS Runtime REQUIRED)
+
 add_library(cvc4parser ${cvc4parser_src_files})
 
 set_target_properties(cvc4parser
diff --git a/src/parser/cvc/CMakeLists.txt b/src/parser/cvc/CMakeLists.txt
index ab88ffe1b..c75df0ab4 100644
--- a/src/parser/cvc/CMakeLists.txt
+++ b/src/parser/cvc/CMakeLists.txt
@@ -14,7 +14,6 @@ add_custom_command(
     ${ANTLR_BINARY}
       ${CMAKE_CURRENT_SOURCE_DIR}/Cvc.g
       -fo ${CMAKE_CURRENT_BINARY_DIR}
-      2> /dev/null # Ignore Antlr3 warnings
   DEPENDS
     Cvc.g
 )
diff --git a/src/parser/smt1/CMakeLists.txt b/src/parser/smt1/CMakeLists.txt
index 2dd0bfd9b..cd27bb513 100644
--- a/src/parser/smt1/CMakeLists.txt
+++ b/src/parser/smt1/CMakeLists.txt
@@ -16,7 +16,6 @@ add_custom_command(
     ${ANTLR_BINARY}
       ${CMAKE_CURRENT_SOURCE_DIR}/Smt1.g
       -fo ${CMAKE_CURRENT_BINARY_DIR}
-      2> /dev/null # Ignore Antlr3 warnings
   DEPENDS
     Smt1.g
 )
diff --git a/src/parser/smt2/CMakeLists.txt b/src/parser/smt2/CMakeLists.txt
index 90cc391b0..f3258839e 100644
--- a/src/parser/smt2/CMakeLists.txt
+++ b/src/parser/smt2/CMakeLists.txt
@@ -18,7 +18,6 @@ add_custom_command(
     ${ANTLR_BINARY}
       ${CMAKE_CURRENT_SOURCE_DIR}/Smt2.g
       -fo ${CMAKE_CURRENT_BINARY_DIR}
-      2> /dev/null # Ignore Antlr3 warnings
   DEPENDS
     Smt2.g
 )
diff --git a/src/parser/tptp/CMakeLists.txt b/src/parser/tptp/CMakeLists.txt
index aadd47a2a..5712e8175 100644
--- a/src/parser/tptp/CMakeLists.txt
+++ b/src/parser/tptp/CMakeLists.txt
@@ -16,7 +16,6 @@ add_custom_command(
     ${ANTLR_BINARY}
       ${CMAKE_CURRENT_SOURCE_DIR}/Tptp.g
       -fo ${CMAKE_CURRENT_BINARY_DIR}
-      2> /dev/null # Ignore Antlr3 warnings
   DEPENDS
     Tptp.g
 )
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index de748ad98..c18f45a12 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -58,6 +58,10 @@ if(CVC4_USE_GMP_IMP)
   list(APPEND util_src_files rational_gmp_imp.cpp integer_gmp_imp.cpp)
 endif()
 
+set(GMP_HOME ${GMP_DIR})
+find_package(GMP REQUIRED)
+
 add_library(util ${util_src_files})
 target_compile_definitions(util PRIVATE -D__BUILDING_CVC4LIB)
-target_link_libraries(util options)
+target_link_libraries(util options ${GMP_LIBRARIES})
+target_include_directories(util PUBLIC ${GMP_INCLUDE_DIR})