try fix

facontidavide · Feb 19, 2024 · 4ca4e72 · 4ca4e72
1 parent a18e80d
commit 4ca4e72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -4,10 +4,15 @@
  zeromq/4.3.5
  zstd/1.5.5
  zlib/1.2.13
+ arrow/15.0.0
 
  [options]
  zeromq*:shared=False
 
  [generators]
  CMakeDeps
  CMakeToolchain
+
+ [tool_requires]
+ cmake/3.28.1
+
diff --git 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()