diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake index e59b4a38af0..2fd897b5d1d 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake @@ -177,7 +177,7 @@ function(create_merged_static_lib output_target) "-o" ${output_lib_path} ${all_library_paths}) - elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|GNU)$") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|GNU|Intel)$") set(ar_script_path ${CMAKE_BINARY_DIR}/${ARG_NAME}.ar) file(WRITE ${ar_script_path}.in "CREATE ${output_lib_path}\n") diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake index f812c96c2ad..a5cd95bd7ab 100644 --- a/cpp/cmake_modules/SetupCxxFlags.cmake +++ b/cpp/cmake_modules/SetupCxxFlags.cmake @@ -126,7 +126,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) set(UNKNOWN_COMPILER_MESSAGE - "Unknown compiler: ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_COMPILER_VERSION}") + "Unknown compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") # compiler flags that are common across debug/release builds if(WIN32) @@ -283,7 +283,8 @@ else() set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /W3") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" - OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" + OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall") else() message(FATAL_ERROR "${UNKNOWN_COMPILER_MESSAGE}")