On Windows also link with -lsharpyuv

TileDB-Inc · Sep 5, 2023 · ae0746a · ae0746a
1 parent 82338c4
commit ae0746a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -24,11 +24,23 @@ jobs:
         run: |
           install.packages(c("remotes", "rcmdcheck"))
           remotes::install_deps(dependencies = TRUE)
-        shell: Rscript {0}
         env:
           R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+        shell: Rscript {0}
       - name: Check
         env:
           _R_CHECK_CRAN_INCOMING_: false
         run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--no-vignettes", "--as-cran"), build_args = c("--no-build-vignettes"), error_on = "error", check_dir = "check")
         shell: Rscript {0}
+      - name: Show install log
+        if: failure()
+        run: |
+          installfile <- "check/tiledb.Rcheck/00install.out"
+          if (file.exists(installfile)) writeLines(readLines(installfile))
+        shell: Rscript {0}
+      - name: Show check log
+        if: failure()
+        run: |
+          checkfile <- "check/tiledb.Rcheck/00check.log"
+          if (file.exists(checkfile)) writeLines(readLines(checkfile))
+        shell: Rscript {0}
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -6,7 +6,7 @@ PKG_LIBS = \
 	-L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) \
 	-L$(RWINLIB)/lib$(R_ARCH)$(CRT) \
 	-ltiledbstatic -lbz2 -lzstd -llz4 -lz -lspdlog \
-	-lwebp -lwebpdecoder -lwebpdemux -lwebpmux \
+	-lwebp -lwebpdecoder -lwebpdemux -lwebpmux -lsharpyuv \
         -llibmagic -lpcre2-posix -lpcre2-8 \
 	-laws-cpp-sdk-identity-management -laws-cpp-sdk-cognito-identity -laws-cpp-sdk-sts -laws-cpp-sdk-s3 -laws-cpp-sdk-core -laws-c-event-stream -laws-checksums -laws-c-common \
 	-lShlwapi -lBcrypt -lRpcrt4 -lWininet -lWinhttp -lws2_32 -lVersion -lUserenv