Skip to content

Commit

Permalink
Fix windows CI
Browse files Browse the repository at this point in the history
  • Loading branch information
robomics committed Feb 6, 2024
1 parent fb9e8ac commit 9af43fd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PWD := $(shell pwd)
export CONAN_HOME := "$(PWD)\conan-staging\.conan2"
export CC := "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("gcc")')"
export CXX := "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("g++")')"
export CONAN_HOME := $(PWD)\conan-staging\.conan2
CC := "$(shell "$(R_HOME)\bin\Rscript" -e 'Sys.which("gcc")')"
CXX := "$(shell "$(R_HOME)\bin\Rscript" -e 'Sys.which("g++")')"

CONANDEPS_MK := $(shell ..\run_conan.py)
include $(CONANDEPS_MK)

PKG_CPPFLAGS := -std=c++17
PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(shell "$(R_HOME)/bin/Rscript" -e 'Rcpp:::CxxFlags()' 2> /dev/null)
PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(shell "$(R_HOME)\bin\Rscript" -e 'Rcpp:::CxxFlags()' 2> /dev/null)
PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -isystem ,$(CONAN_INCLUDE_DIRS))
PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -isystem ,$(CONAN_INCLUDE_DIRS_HDF5_HDF5_C))
PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -D ,$(CONAN_DEFINES))
Expand Down

0 comments on commit 9af43fd

Please sign in to comment.