From 46a129decbe22fd93b5c6a3280d270c51661a273 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 7 Sep 2020 14:14:47 -0700
Subject: [xtensor-io] [taskflow] [tcl] [sophus] Fix CI 2020-09-06 (#13382)

* [xtensor-io] Disable undeclared HighFive detection which is currently broken.

HIGHFIVE 2.2.2: (Re)Detecting Highfive dependencies (HIGHFIVE_USE_INSTALL_DEPS=NO)
CMake Error: install(EXPORT "xtensor-io-targets" ...) includes target "xtensor-io" which requires target "libdeps" that is not in any export set.
CMake Error in CMakeLists.txt:
  export called with target "xtensor-io" which requires target "libdeps" that
  is not in any export set.

* [tcl] [taskflow] Mark passing in CI.
---
 ports/xtensor-io/CONTROL                |  1 +
 ports/xtensor-io/disable-highfive.patch | 20 ++++++++++++++++++++
 ports/xtensor-io/portfile.cmake         |  2 ++
 scripts/ci.baseline.txt                 |  3 ---
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 ports/xtensor-io/disable-highfive.patch

diff --git a/ports/xtensor-io/CONTROL b/ports/xtensor-io/CONTROL
index 20d92198d..d426f0935 100644
--- a/ports/xtensor-io/CONTROL
+++ b/ports/xtensor-io/CONTROL
@@ -1,5 +1,6 @@
 Source: xtensor-io
 Version: 0.9.0
+Port-Version: 1
 Description: xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5
 Homepage: https://github.com/xtensor-stack/xtensor-io
 Build-Depends: xtensor, xtl
diff --git a/ports/xtensor-io/disable-highfive.patch b/ports/xtensor-io/disable-highfive.patch
new file mode 100644
index 000000000..e0733b0a9
--- /dev/null
+++ b/ports/xtensor-io/disable-highfive.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c3595a1..d38dc21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,6 +136,7 @@ else()
+   message(WARNING "ZLIB not found - install zlib for xnpz file support")
+ endif()
+ 
++if (0)
+ message(STATUS "Trying to find HighFive for npz file support")
+ find_package(HighFive)
+ find_package(HDF5)
+@@ -154,6 +155,7 @@ if (${HighFive_FOUND} AND ${HDF5_FOUND})
+ else()
+   message(WARNING "HighFive and/or HDF5 not found - install HighFive and HDF5 for HDF5 file support")
+ endif()
++endif()
+ 
+ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
+     set(BUILD_TESTS ON)
diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake
index d5b85978f..992aaeb4d 100644
--- a/ports/xtensor-io/portfile.cmake
+++ b/ports/xtensor-io/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF 863dd7dad6010038568c169f20e3d3e87bd3b37a # 0.9.0
     SHA512 f6190c5c2c487a8170e5af1ddfd2e921c414274762dac6c8f9519d579d5eb5dd3683678e7b4f589b7ced8a42f648742755acb42e2122960d6ca7fc1a82b0723e
     HEAD_REF master
+    PATCHES
+        disable-highfive.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 58dc39266..d848189b3 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -243,7 +243,6 @@ cppmicroservices:arm-uwp=fail
 cppmicroservices:x64-uwp=fail
 cpp-netlib:arm-uwp=fail
 cpp-netlib:x64-uwp=fail
-cpp-taskflow:x64-osx=fail
 cppcoro:x64-linux=fail
 cppcoro:arm-uwp=fail
 cppcoro:x64-uwp=fail
@@ -1603,7 +1602,6 @@ soil:x64-linux=skip
 soil:x64-osx=skip
 soil2:arm-uwp=fail
 soil2:x64-uwp=fail
-sophus:x64-linux=fail
 soqt:arm64-windows=fail
 soqt:arm-uwp=fail
 soqt:x64-uwp=fail
@@ -1656,7 +1654,6 @@ tbb:x64-uwp=fail
 tcl:arm-uwp=fail
 tcl:arm64-windows=fail
 tcl:x64-uwp=fail
-tcl:x64-linux=fail
 tcl:x64-osx=fail
 teemo:x64-uwp=fail
 teemo:arm-uwp=fail
-- 
cgit v1.2.3