Skip to content

Commit

Permalink
pass the to be installed modules to install-jaspModuleInstaller.R.in (#…
Browse files Browse the repository at this point in the history
…5684)

* pass the to be installed modules to install-jaspModuleInstaller.R.in

* pass character vector rather than a list
  • Loading branch information
vandenman authored Oct 1, 2024
1 parent 3556077 commit c642a80
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Modules/install-jaspModuleInstaller.R.in
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ renv::restore(lockfile = lf, library = .libPaths(), rebuild = pkgName)


cat("jaspModuleInstaller::writeModuleStatusObject\n")
jaspModuleInstaller::writeModuleStatusObject("@PROJECT_SOURCE_DIR@", oldModuleStatusObject, "@MODULES_BINARY_PATH@")
modulesToInstallRaw <- "@JASP_COMMON_MODULES@;@JASP_EXTRA_MODULES@"
modulesToInstall <- strsplit(modulesToInstallRaw, ";", fixed = TRUE)[[1]] # should perhaps use CMAKE_PREFIX_PATH
jaspModuleInstaller::writeModuleStatusObject("@PROJECT_SOURCE_DIR@", oldModuleStatusObject, "@MODULES_BINARY_PATH@", modulesToInstall)

#This is necessary because of conflicts with Matrix dep of base R lib.
#Can be removed when a new version of R updates its Matrix
Expand Down

0 comments on commit c642a80

Please sign in to comment.