1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
diff --color --unified --recursive --text jasp-desktop-0.16.2/Tools/CMake/R.cmake jasp-desktop-0.16.21/Tools/CMake/R.cmake
--- jasp-desktop-0.16.2/Tools/CMake/R.cmake 2022-04-19 15:47:06.000000000 +0800
+++ jasp-desktop-0.16.21/Tools/CMake/R.cmake 2022-05-23 01:21:50.757847997 +0800
@@ -706,8 +706,9 @@
set(R_EXECUTABLE "${R_HOME_PATH}/bin/R")
set(RCPP_PATH "${R_LIBRARY_PATH}/Rcpp")
set(RINSIDE_PATH "${R_LIBRARY_PATH}/RInside")
-
- set(USE_LOCAL_R_LIBS_PATH ", lib='${R_LIBRARY_PATH}'")
+ if(NOT USE_LOCAL_R_LIBS_PATH)
+ set(USE_LOCAL_R_LIBS_PATH ", lib='${R_LIBRARY_PATH}'")
+ endif(NOT USE_LOCAL_R_LIBS_PATH)
message(CHECK_START "Looking for R.h")
set(R_INCLUDE_PATH "${R_HOME_PATH}/include")
diff --color --unified --recursive --text jasp-desktop-0.16.2/Tools/CMake/Modules.cmake jasp-desktop-0.16.21/Tools/CMake/Modules.cmake
--- jasp-desktop-0.16.2/Tools/CMake/Modules.cmake 2022-04-19 15:47:06.000000000 +0800
+++ jasp-desktop-0.16.21/Tools/CMake/Modules.cmake 2022-05-23 02:02:39.562203992 +0800
@@ -158,14 +158,6 @@
if ('jaspBase' %in% installed.packages()) {
cat(NULL, file='${MODULES_BINARY_PATH}/jaspBase-installed-successfully.log')
} else {
- install.packages(c('ggplot2', 'gridExtra', 'gridGraphics',
- 'jsonlite', 'modules', 'officer', 'pkgbuild',
- 'plyr', 'qgraph', 'ragg', 'R6', 'renv',
- 'rjson', 'rvg', 'svglite', 'systemfonts',
- 'withr', 'testthat',
- 'data.table', 'httr', 'lifecycle',
- 'pkgload', 'remotes', 'stringi', 'stringr',
- 'vdiffr'), type='${R_PKG_TYPE}', repos='${R_REPOSITORY}' ${USE_LOCAL_R_LIBS_PATH})
install.packages('${PROJECT_SOURCE_DIR}/Engine/jaspBase/', type='source', repos=NULL ${USE_LOCAL_R_LIBS_PATH}, INSTALL_opts='--no-multiarch --no-docs --no-test-load')
}
")
|