[buck-yeh-bux] fix clang-cl builds (#26248)

* [buck-yeh-bux] fix clang-cl * v db
microsoft · Aug 10, 2022 · afa74ae · afa74ae
1 parent 1ed3a89
commit afa74ae
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/ports/buck-yeh-bux/fix-clang-cl.patch b/ports/buck-yeh-bux/fix-clang-cl.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 306074e50..a032ab09e 100644
+--- 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
+index 093a1da8d..8de40efa4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -8,7 +8,7 @@ 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()
+
diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
     REF b046518dcffcdef9b8dbccd0accc2636df301766 # v1.6.6
     SHA512 af1ca5c37623a09c64e1a84a630a26911be8c87eb007b112665b7c6080dfac67bd89eb36367202c5d29af97f4e549d6f27e41410220a57bd7756bdb1ecf8ddf0
     HEAD_REF main
+    PATCHES fix-clang-cl.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "buck-yeh-bux",
   "version": "1.6.6",
+  "port-version": 1,
   "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.",
   "homepage": "https://github.com/buck-yeh/bux",
   "license": "MIT",

diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f7bc53828c4e0a83a3242bb28682011495747ad2",
+      "version": "1.6.6",
+      "port-version": 1
+    },
     {
       "git-tree": "3d58f00b46ad32a1bfba6e5ee139aa47047e2bb6",
       "version": "1.6.6",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1190,7 +1190,7 @@
     },
     "buck-yeh-bux": {
       "baseline": "1.6.6",
-      "port-version": 0
+      "port-version": 1
     },
     "buck-yeh-bux-mariadb-client": {
       "baseline": "1.0.3",