From e8a2fbe524d7ff995c641682b3422e29fe222625 Mon Sep 17 00:00:00 2001 From: Ajay Panyala Date: Sun, 5 Nov 2017 13:53:56 -0800 Subject: [PATCH 1/2] Support building ANTLR Cpp Runtime with Intel compilers --- runtime/Cpp/CMakeLists.txt | 2 +- runtime/Cpp/runtime/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt index 3ec785aac0..f4940c0c5e 100644 --- a/runtime/Cpp/CMakeLists.txt +++ b/runtime/Cpp/CMakeLists.txt @@ -95,7 +95,7 @@ else() endif() # Compiler-specific C++11 activation. -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") +if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel") execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) # Just g++-5.0 and greater contain header. (test in ubuntu) diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt index 0c2d534187..fdb920e994 100644 --- a/runtime/Cpp/runtime/CMakeLists.txt +++ b/runtime/Cpp/runtime/CMakeLists.txt @@ -53,7 +53,7 @@ endif () if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") set(disabled_compile_warnings "${disabled_compile_warnings} -Wno-dollar-in-identifier-extension -Wno-four-char-constants") -elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") +elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel") set(disabled_compile_warnings "${disabled_compile_warnings} -Wno-multichar") endif() From 154585cffd01d4da26d96db52d57fea56b29fc22 Mon Sep 17 00:00:00 2001 From: Ajay Panyala Date: Sun, 5 Nov 2017 13:56:57 -0800 Subject: [PATCH 2/2] Update contributors.txt --- contributors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.txt b/contributors.txt index a270f12482..e9fe61ffb9 100644 --- a/contributors.txt +++ b/contributors.txt @@ -171,3 +171,4 @@ YYYY/MM/DD, github id, Full name, email 2017/05/29, rlfnb, Ralf Neeb, rlfnb@rlfnb.de 2017/10/29, gendalph, Максим Прохоренко, Maxim\dotProhorenko@gm@il.com 2017/11/02, jasonmoo, Jason Mooberry, jason.mooberry@gmail.com +2017/11/05, ajaypanyala, Ajay Panyala, ajay.panyala@gmail.com