Merge pull request #2104 from ajaypanyala/support_intel_compiler

Support building C++ Runtime with Intel compilers

Author: parrt

contributors.txt

@@ -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]

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 <codecvt> header. (test in ubuntu)

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()