Skip to content

Commit bc63598

Browse files
committed
1 parent 8dcc11e commit bc63598

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

docs/cmake-toml.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ unix = "UNIX"
7272
bsd = "CMAKE_SYSTEM_NAME MATCHES \"BSD\""
7373
linux = "CMAKE_SYSTEM_NAME MATCHES \"Linux\""
7474
gcc = "CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\" OR CMAKE_C_COMPILER_ID STREQUAL \"GNU\""
75-
clang = "CMAKE_CXX_COMPILER_ID MATCHES \"Clang\" OR CMAKE_C_COMPILER_ID MATCHES \"Clang\""
75+
clang = "(CMAKE_CXX_COMPILER_ID MATCHES \"Clang\" AND NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES \"^MSVC$\") OR (CMAKE_C_COMPILER_ID MATCHES \"Clang\" AND NOT CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES \"^MSVC$\")"
7676
msvc = "MSVC"
7777
root = "CMKR_ROOT_PROJECT"
7878
x64 = "CMAKE_SIZEOF_VOID_P EQUAL 8"

src/project_parser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
265265
conditions["bsd"] = R"cmake(CMAKE_SYSTEM_NAME MATCHES "BSD")cmake";
266266
conditions["linux"] = conditions["lunix"] = R"cmake(CMAKE_SYSTEM_NAME MATCHES "Linux")cmake";
267267
conditions["gcc"] = R"cmake(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")cmake";
268-
conditions["clang"] = R"cmake(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")cmake";
268+
conditions["clang"] =
269+
R"cmake((CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC$") OR (CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC$"))cmake";
269270
conditions["msvc"] = R"cmake(MSVC)cmake";
270271
conditions["root"] = R"cmake(CMKR_ROOT_PROJECT)cmake";
271272
conditions["x64"] = R"cmake(CMAKE_SIZEOF_VOID_P EQUAL 8)cmake";

0 commit comments

Comments
 (0)