Fix deprecated windows build

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

.github/actions/install-deps/action.yaml

@@ -64,6 +64,17 @@ runs:
           with:
               cmake-version: "3.29.6"
 
+        - name: Setup MSVC environment (Windows)
+          if: ${{ runner.os == 'Windows' }}
+          uses: ilammy/msvc-dev-cmd@v1
+          with:
+              arch: ${{ inputs.arch == 'aarch64' && 'amd64_arm64' || 'x64' }}
+
+        - name: Force Ninja generator (Windows)
+          if: ${{ runner.os == 'Windows' }}
+          shell: bash
+          run: echo "CMAKE_GENERATOR=Ninja" >> "$GITHUB_ENV"
+
         - name: Install pnpm
           uses: pnpm/action-setup@v3
           with:

Cargo.lock

@@ -10,13 +10,7 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import {
-    PageView as PspViewer,
-    compareNodes,
-    expect,
-    test,
-} from "@perspective-dev/test";
-import { SymbolPair } from "@perspective-dev/test/src/js/models/column_settings";
+import { PageView as PspViewer, expect, test } from "@perspective-dev/test";
 import { Page } from "@playwright/test";
 
 const symbols = [

packages/viewer-charts/test/ts/xy_symbols.spec.ts

@@ -52,9 +52,9 @@ impl From<Aggregate> for view_config::AggList {
     fn from(value: Aggregate) -> Self {
         view_config::AggList {
             aggregations: match value {
-                Aggregate::SingleAggregate(x) => vec![format!("{}", x)],
+                Aggregate::SingleAggregate(x) => vec![x],
                 Aggregate::MultiAggregate(x, y) => {
-                    vec![format!("{}", x), format!("{}", y.join(","))]
+                    vec![x, y.join(",")]
                 },
             },
         }

rust/perspective-client/src/rust/config/aggregates.rs

@@ -51,7 +51,7 @@ protobuf-src = ["perspective-client/protobuf-src"]
 crate-type = ["cdylib"]
 
 [build-dependencies]
-cmake = "0.1.50"
+cmake = "0.1.58"
 num_cpus = "^1.16.0"
 pyo3-build-config = "0.25.1"
 python-config-rs = "0.1.2"

rust/perspective-python/Cargo.toml

@@ -39,7 +39,7 @@ python = []
 disable-cpp = []
 
 [build-dependencies]
-cmake = "0.1.50"
+cmake = "0.1.58"
 num_cpus = "^1.15.0"
 shlex = "1.3.0"
 protobuf-src = { version = "2.1.1" }

rust/perspective-server/Cargo.toml

@@ -207,6 +207,19 @@ if(PSP_PYTHON_BUILD AND MACOS)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
 endif()
 
+if(EMSCRIPTEN)
+    # Emscripten 6.0.0's libc no longer exposes pthread symbols without
+    # `-pthread`, so CMake's `FindThreads` probe (`CMAKE_HAVE_LIBC_PTHREAD`)
+    # fails and dependencies that `find_package(Threads REQUIRED)` (protobuf)
+    # refuse to configure. We deliberately do NOT enable pthreads for the WASM
+    # build (no SharedArrayBuffer, no `-pthread`). Pre-seeding this *cache* entry
+    # (global, so it reaches protobuf's add_subdirectory) makes `FindThreads`
+    # skip the probe and report success via its `CMAKE_HAVE_LIBC_PTHREAD` branch,
+    # which sets `CMAKE_THREAD_LIBS_INIT ""` — i.e. `Threads::Threads` links
+    # nothing and the build stays single-threaded, as it did before the bump.
+    set(CMAKE_HAVE_LIBC_PTHREAD TRUE CACHE BOOL "psp: satisfy FindThreads on WASM without enabling pthreads" FORCE)
+endif()
+
 # ######################
 set(psp_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/include")
 
@@ -357,7 +370,10 @@ endif()
 set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Disable rapidjson tests")
 
 if(PSP_PYODIDE)
-    set(RELOCATABLE_FLAGS " -sRELOCATABLE=1 -sSIDE_MODULE=2 -fwasm-exceptions -sSUPPORT_LONGJMP=wasm \ ")
+    # NB: `-sRELOCATABLE=1` was removed in emscripten 6.0.0 ("No longer
+    # supported") and is redundant here — `-sSIDE_MODULE=2` already emits a
+    # relocatable side module.
+    set(RELOCATABLE_FLAGS " -sSIDE_MODULE=2 -fwasm-exceptions -sSUPPORT_LONGJMP=wasm \ ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS "${RELOCATABLE_FLAGS} -sWASM_BIGINT=1 ")
     string(APPEND CMAKE_C_FLAGS "${RELOCATABLE_FLAGS}")
     string(APPEND CMAKE_CXX_FLAGS "${RELOCATABLE_FLAGS}")

rust/perspective-server/cpp/perspective/CMakeLists.txt

@@ -154,6 +154,7 @@ perspective-string-column-style[theme="Phosphor"] {
     --psp-expression--function--color: var(--theme-green-bright);
     --psp-expression--psp-error--color: var(--theme-red);
     --psp-calendar--filter: invert(1) hue-rotate(70deg);
+    --psp-input--filter: invert(1) hue-rotate(70deg);
     --psp-warning--color: var(--theme-bg0);
     --psp-warning--background: var(--theme-amber);
     --psp-icon--select-arrow--mask-image: var(