[vcpkg] Merge from microsoft/vcpkg#26248

in order to remove fix-clang-cl.patch
buck-yeh · Feb 22, 2023 · ae15cdc · ae15cdc
1 parent 317aa72
commit ae15cdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,13 +5,13 @@ project(bux)
 set(GNU_LIKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wconversion -Wno-parentheses -g3 -Og -std=c++20")
 #string(APPEND CMAKE_CXX_FLAGS " -g3")
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MSVC)
     message("Clang")
     string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     message("GNU")
     string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS}")
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+elseif(MSVC)
     message("MSVC")
     string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /std:c++latest /MP")
 else()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,8 +8,6 @@ add_library(bux STATIC
         XConsole.cpp XException.cpp
         )
 target_include_directories(bux PRIVATE ../include/bux)
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+if(MSVC)
 target_link_libraries(bux PRIVATE fmt::fmt)
 endif()
-
-