Merge branch 'master' of https://github.com/stnava/ITKR

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: ITKR
 Type: Package
 Title: ITK in R
-Version: 0.5.3.3.0
-Date: 2020-10-15
+Version: 0.5.3.3
+Date: 2021-07-23
 Authors@R: c(
     person(c("Brian", "B"), "Avants", role = c("aut", "cre"), email = "[email protected]"),
     person(c("Benjamin", "M"), "Kandel", role = "ctb", email = "NA"),

R/flags.R

@@ -25,6 +25,11 @@ get_itk_dir = function() {
   # Keep ITK dirs  
   dirs = dirs[ grepl("^ITK", bn) ]
   if (length(dirs) == 0) {
+    message("Printing out lib dir\n")
+    message("lib_dir:", lib_dir)
+    print(list.files(lib_dir))
+    message("package_dir:", system.file(package="ITKR"))
+    print(list.files(system.file(package="ITKR")))
     stop("No ITK Directory Found!")
   }
   if (length(dirs) == 1) {

src/Makevars.win

@@ -10,7 +10,9 @@ all: $(SHLIB)
 
 $(SHLIB): libs
 
-libs: ; cd itkb && $(MAKE) VERBOSE=1 -j 2 || \
+libs: ; cd itkb && mingw32-make -j 2 || \
+mingw32-make install || \
+$(MAKE) VERBOSE=1 -j 2 || \
 $(MAKE) install && ls ../ && rm -rf ../itks && \
 rm -rf ITKInternalEigen3-build/Makefile && \
 rm -rf CMakeFiles/ && rm -rf Modules/ && rm -rf CMakeTmp/ && \