From 3ee5f2212f287046ab9cda62174eb58ea9561d42 Mon Sep 17 00:00:00 2001 From: Andres Noetzli Date: Mon, 12 Jul 2021 12:05:14 -0700 Subject: [PATCH] Fix ANTLR build on CMake <3.11 (#6864) With CMake 3.11 and later, `` 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 `` instead, which is both nicer and substituted in older versions of CMake. [0] https://cmake.org/cmake/help/latest/release/3.11.html#modules --- cmake/FindANTLR3.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 - /../antlr-3.4-complete.jar + /share/java/antlr-3.4-complete.jar BUILD_BYPRODUCTS /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 - /config.guess + /share/config.guess BUILD_BYPRODUCTS /share/config.guess ) @@ -83,7 +83,7 @@ if(NOT ANTLR3_FOUND_SYSTEM) CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ${CMAKE_COMMAND} -E copy - /config.sub + /share/config.sub BUILD_BYPRODUCTS /share/config.sub ) -- 2.30.2