From: Andres Noetzli <andres.noetzli@gmail.com>
Date: Mon, 12 Jul 2021 19:05:14 +0000 (-0700)
Subject: Fix ANTLR build on CMake <3.11 (#6864)
X-Git-Tag: cvc5-1.0.0~1503
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3ee5f2212f287046ab9cda62174eb58ea9561d42;p=cvc5.git

Fix ANTLR build on CMake <3.11 (#6864)

With CMake 3.11 and later, `<DOWNLOAD_DIR>` is substituted in
`ExternalProject_Add` but not in older versions [0]. To maintain
compatibility with older versions of CMake, this commit changes
`ExternalProject_Add` to use `<DOWNLOADED_FILE>` instead, which is both
nicer and substituted in older versions of CMake.

[0] https://cmake.org/cmake/help/latest/release/3.11.html#modules
---

diff --git a/cmake/FindANTLR3.cmake b/cmake/FindANTLR3.cmake
index 4e669e4ac..9d62924be 100644
--- a/cmake/FindANTLR3.cmake
+++ b/cmake/FindANTLR3.cmake
@@ -53,7 +53,7 @@ if(NOT ANTLR3_FOUND_SYSTEM)
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
-            <SOURCE_DIR>/../antlr-3.4-complete.jar
+            <DOWNLOADED_FILE>
             <INSTALL_DIR>/share/java/antlr-3.4-complete.jar
         BUILD_BYPRODUCTS <INSTALL_DIR>/share/java/antlr-3.4-complete.jar
     )
@@ -68,7 +68,7 @@ if(NOT ANTLR3_FOUND_SYSTEM)
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
-          <DOWNLOAD_DIR>/config.guess
+          <DOWNLOADED_FILE>
           <INSTALL_DIR>/share/config.guess
         BUILD_BYPRODUCTS <INSTALL_DIR>/share/config.guess
     )
@@ -83,7 +83,7 @@ if(NOT ANTLR3_FOUND_SYSTEM)
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
-          <DOWNLOAD_DIR>/config.sub
+          <DOWNLOADED_FILE>
           <INSTALL_DIR>/share/config.sub
         BUILD_BYPRODUCTS <INSTALL_DIR>/share/config.sub
     )