Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support building C++ Runtime with Intel compilers #2104

Merged
merged 4 commits into from
Nov 29, 2017
Merged

Support building C++ Runtime with Intel compilers #2104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8a2fbe
Support building ANTLR Cpp Runtime with Intel compilers
ajaypanyala Nov 5, 2017
154585c
Update contributors.txt
ajaypanyala Nov 5, 2017
14880cb
Merge branch 'master' into support_intel_compiler
parrt Nov 29, 2017
c6a8141
Merge branch 'master' into support_intel_compiler
parrt Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,5 @@ YYYY/MM/DD, github id, Full name, email
2017/05/29, rlfnb, Ralf Neeb, [email protected]
2017/10/29, gendalph, Максим Прохоренко, Maxim\dotProhorenko@[email protected]
2017/11/02, jasonmoo, Jason Mooberry, [email protected]
2017/11/24, zqlu.cn, Zhiqiang Lu, [email protected]
2017/11/05, ajaypanyala, Ajay Panyala, [email protected]
2017/11/24, zqlu.cn, Zhiqiang Lu, [email protected]
2 changes: 1 addition & 1 deletion runtime/Cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <codecvt> header. (test in ubuntu)
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down