From f001c6f01260194cc9f03bae4c15d5af4baf2e12 Mon Sep 17 00:00:00 2001 From: ddzama Date: Thu, 2 Jun 2022 13:08:35 +0300 Subject: [PATCH] 0032921: more flexible CMAKE_CXX_COMPILER_ID identification (fixups previous commit!) --- adm/cmake/occt_defs_flags.cmake | 6 +++--- samples/glfw/adm/cmake/FindOpenCASCADE.cmake | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake index 601782366a..a7d7deda71 100644 --- a/adm/cmake/occt_defs_flags.cmake +++ b/adm/cmake/occt_defs_flags.cmake @@ -116,9 +116,9 @@ if (MSVC) else() set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") endif() -elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32") endif() if (BUILD_SHARED_LIBS) @@ -146,7 +146,7 @@ else () endif() set (CMAKE_CXX_STANDARD_REQUIRED ON) -if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang") +if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]") if (APPLE) # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated. set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}") diff --git a/samples/glfw/adm/cmake/FindOpenCASCADE.cmake b/samples/glfw/adm/cmake/FindOpenCASCADE.cmake index 0b5a9eeeba..f079c15425 100644 --- a/samples/glfw/adm/cmake/FindOpenCASCADE.cmake +++ b/samples/glfw/adm/cmake/FindOpenCASCADE.cmake @@ -39,9 +39,9 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCC) set (MY_COMPILER gcc) elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) set (MY_COMPILER gcc) -elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]") set (MY_COMPILER clang) -elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") +elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Ii][Nn][Tt][Ee][Ll]") set (MY_COMPILER icc) else() set (MY_COMPILER ${CMAKE_GENERATOR}) -- 2.39.5