diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index c201369..0000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 4.80.1 -Date: 2023-10-31 20:16:13 UTC -SHA: a232d31f9896a90915891173e4d284ac9f8f7892 diff --git a/R/install.R b/R/install.R index db4d4ee..9d1c463 100644 --- a/R/install.R +++ b/R/install.R @@ -72,6 +72,9 @@ defaultOpenCVPath <- function() { config$source_dir <- paste0(config$tmp_dir, "\\opencv-", version, "\\") config$contrib_dir <- paste0(config$tmp_dir, "\\opencv_contrib-", version, "\\modules") config$build_dir <- paste0(config$source_dir, "build") + + ix <- grepl("path", names(config)) | grepl("dir", names(config)) + config[ix] <- lapply(config[ix], function(st) gsub("\\\\", "/", utils::shortPathName(st))) } else if (config$os_type == "unix") { config$install_path <- install_path config$pkg_path <- find.package("ROpenCVLite") @@ -86,12 +89,13 @@ defaultOpenCVPath <- function() { config$source_dir <- paste0(config$tmp_dir, "/opencv-", version, "/") config$contrib_dir <- paste0(config$tmp_dir, "/opencv_contrib-", version, "/modules") config$build_dir <- paste0(config$source_dir, "build") + + ix <- grepl("path", names(config)) | grepl("dir", names(config)) + config[ix] <- lapply(config[ix], normalizePath, mustWork = FALSE, winslash = "/") } else { stop("Unsupported OS type.") } - ix <- grepl("path", names(config)) | grepl("dir", names(config)) - config[ix] <- lapply(config[ix], normalizePath, mustWork = FALSE, winslash = "/") config } diff --git a/docs/articles/install.html b/docs/articles/install.html index af0c179..d8a3655 100644 --- a/docs/articles/install.html +++ b/docs/articles/install.html @@ -162,14 +162,14 @@
If you have the rig
utility
installed on your computer, you can install Rtools
from a
terminal running PowerShell:
# For Rtools40
-rig add rtools40
+# For Rtools40
+rig add rtools40
# For Rtools42
-rig add rtools42
+rig add rtools42
# For Rtools43
-rig add rtools43
+rig add rtools43
If you have the winget
utility installed on your computer, you can install Rtools
from a terminal running PowerShell:
Note: Only Rtools42
seems to be available
through winget
at the moment.
If you have the winget
utility installed on your computer, you can install Cmake
from a terminal running PowerShell:
You can manually download the
-CMakeinstaller for Windows at [https://cmake.org/download/](https://cmake.org/download/). Make sure to tell the installer to add
CMake`
-to your “PATH” during the installation process.
You can manually download the CMake
installer for
+Windows at https://cmake.org/download/. Make
+sure to tell the installer to add CMake
to your “PATH”
+during the installation process.
If you have the rig
utility
installed on your computer, you can install Rtools
from a
terminal running PowerShell:
# For Rtools40
-rig add rtools40
+# For Rtools40
+rig add rtools40
# For Rtools42
-rig add rtools42
+rig add rtools42
# For Rtools43
-rig add rtools43
+rig add rtools43
If you have the winget
utility installed on your computer, you can install Rtools
from a terminal running PowerShell:
Note: Only Rtools42
seems to be available
through winget
at the moment.
If you have the winget
utility installed on your computer, you can install Cmake
from a terminal running PowerShell:
You can manually download the
-CMakeinstaller for Windows at [https://cmake.org/download/](https://cmake.org/download/). Make sure to tell the installer to add
CMake`
-to your “PATH” during the installation process.
You can manually download the CMake
installer for
+Windows at https://cmake.org/download/. Make
+sure to tell the installer to add CMake
to your “PATH”
+during the installation process.