From 10ff0b737c03bae31647e08ec4d02d4dbf2fc509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20M=C3=BCller?= Date: Thu, 18 Jul 2024 09:55:33 +0000 Subject: [PATCH] fix: Use CXX compiler of main project for ANTLR external project. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR adds the `-DCMAKE_CXX_COMPILER` flag to the CMake flags of the external project for ANTLR. Without that, the external project uses the system default, which may not be what the user wants (and even be broken). Signed-off-by: Ingo Müller --- third_party/antlr4/cmake/ExternalAntlr4Cpp.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/third_party/antlr4/cmake/ExternalAntlr4Cpp.cmake b/third_party/antlr4/cmake/ExternalAntlr4Cpp.cmake index 63d7d943..1f82ea44 100644 --- a/third_party/antlr4/cmake/ExternalAntlr4Cpp.cmake +++ b/third_party/antlr4/cmake/ExternalAntlr4Cpp.cmake @@ -97,7 +97,8 @@ if(ANTLR4_ZIP_REPOSITORY) -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} -DDISABLE_WARNINGS:BOOL=ON - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project INSTALL_COMMAND "" @@ -117,7 +118,8 @@ else() -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DWITH_STATIC_CRT:BOOL=${ANTLR4_WITH_STATIC_CRT} -DDISABLE_WARNINGS:BOOL=ON - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} # -DCMAKE_CXX_STANDARD:STRING=17 # if desired, compile the runtime with a different C++ standard # -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} # alternatively, compile the runtime with the same C++ standard as the outer project INSTALL_COMMAND ""