[ableton] no werror et al (#28480)

microsoft · Dec 22, 2022 · 6adca01 · 6adca01
1 parent 7e6afc2
commit 6adca01
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/ports/ableton/no-werror.patch b/ports/ableton/no-werror.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake_include/ConfigureCompileFlags.cmake b/cmake_include/ConfigureCompileFlags.cmake
+index 63bdfec..80879f9 100644
+--- a/cmake_include/ConfigureCompileFlags.cmake
++++ b/cmake_include/ConfigureCompileFlags.cmake
+@@ -25,7 +25,6 @@ if(UNIX)
+     set(build_flags_COMMON_LIST
+       ${build_flags_COMMON_LIST}
+       "-Weverything"
+-      "-Werror"
+       "-Wno-c++98-compat"
+       "-Wno-c++98-compat-pedantic"
+       "-Wno-deprecated"
+@@ -44,7 +43,6 @@ if(UNIX)
+   elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+     set(build_flags_COMMON_LIST
+       ${build_flags_COMMON_LIST}
+-      "-Werror"
+       "-Wno-multichar"
+     )
+   endif()
+@@ -87,7 +85,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+     ${build_flags_COMMON_LIST}
+     "/MP"
+     "/Wall"
+-    "/WX"
+     "/EHsc"
+
+     #############################
diff --git a/ports/ableton/portfile.cmake b/ports/ableton/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
         replace_local_asiostandalone_by_vcpkg_asio.patch
         replace_asiosdk_download_by_vcpkg_asiosdk.patch
         replace_local_catch_by_vcpkg_catch2.patch
+        no-werror.patch
 )
 # Note that the dependencies ASIO and ASIOSDK are completely different things:
 # -ASIO (ASyncronous IO) is a cross-platform C++ library for network and low-level I/O programming

diff --git a/ports/ableton/vcpkg.json b/ports/ableton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ableton",
   "version": "3.0.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
   "homepage": "https://www.ableton.com/en/link/",
   "documentation": "http://ableton.github.io/link/",

diff --git a/versions/a-/ableton.json b/versions/a-/ableton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d688b97174372d4d7d73278cece5bdc5a64b4136",
+      "version": "3.0.5",
+      "port-version": 2
+    },
     {
       "git-tree": "70d81e7e966f983af654d779a02817d89eacea3b",
       "version": "3.0.5",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -10,7 +10,7 @@
     },
     "ableton": {
       "baseline": "3.0.5",
-      "port-version": 1
+      "port-version": 2
     },
     "abseil": {
       "baseline": "20220623.1",