From 4ca4e7236c2b6834c7fda0ebdc203638f3cb6230 Mon Sep 17 00:00:00 2001
From: Davide Faconti <davide.faconti@gmail.com>
Date: Mon, 19 Feb 2024 18:29:23 +0100
Subject: [PATCH] try fix

---
 .github/workflows/windows.yaml                  | 6 +++---
 conanfile.txt                                   | 5 +++++
 plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 636c591f6..7db5350b8 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -44,12 +44,12 @@ jobs:
           cache-key-prefix: 'install-qt-action'
       
       - name: Install dependencies
-        run: conan install . -s compiler.cppstd=17 --build=missing -s build_type=${{env.BUILD_TYPE}} --output-folder=${{github.workspace}}/build
+        run: conan install . -s compiler.cppstd=17 --build=missing -s build_type=Release --output-folder=${{github.workspace}}/build
     
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_TOOLCHAIN_FILE="${{github.workspace}}/build/conan_toolchain.cmake" -DCMAKE_BUILD_TYPE==Release -DBUILDING_WITH_CONAN=ON
     
       - name: Build Plotjuggler
         shell: pwsh
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        run: cmake --build ${{github.workspace}}/build
  
diff --git a/conanfile.txt b/conanfile.txt
index 623eb578d..bfd477169 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -4,6 +4,7 @@
  zeromq/4.3.5
  zstd/1.5.5
  zlib/1.2.13
+ arrow/15.0.0
 
  [options]
  zeromq*:shared=False
@@ -11,3 +12,7 @@
  [generators]
  CMakeDeps
  CMakeToolchain
+ 
+ [tool_requires]
+ cmake/3.28.1
+
diff --git a/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt b/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt
index d5a728bf0..d62ef3638 100644
--- a/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt
+++ b/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(BUILDING_WITH_CONAN)
-    find_package(zstd CONFIG REQUIRED)
+    find_package(zstd REQUIRED)
     set(Zstd_LIBRARIES zstd::libzstd_static)
     set(Zstd_FOUND ON)
 else()