diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2021-07-12 12:05:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 19:05:14 +0000 |
| commit | 3ee5f2212f287046ab9cda62174eb58ea9561d42 (patch) | |
| tree | 05d54305f29de1f5d152aae0e601f5779609935e /cmake/FindANTLR3.cmake | |
| parent | b35641f1a4ac8d70cf868b273971ee7c5e3b35f0 (diff) | |
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
Diffstat (limited to 'cmake/FindANTLR3.cmake')
| -rw-r--r-- | cmake/FindANTLR3.cmake | 6 |
1 files 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 - <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 ) |