fix: restore accidentally deleted edits to locate R packages

This commit is contained in:
Max Lübke 2022-11-10 15:56:03 +01:00
parent d6cd0ac3a8
commit d010301bc1

View File

@ -12,12 +12,12 @@ if(R_EXE)
find_path( find_path(
R_INCLUDE_DIR R.h R_INCLUDE_DIR R.h
HINTS ${R_ROOT_DIR} HINTS ${R_ROOT_DIR}
PATHS /usr/inlcude /usr/local/include /usr/share PATHS /usr/include /usr/local/include /usr/share
PATH_SUFFIXES include/R R/include PATH_SUFFIXES include/R R/include
) )
find_library( find_library(
R_LIBRARY R R_LIBRARY libR.so
HINTS ${R_ROOT_DIR}/lib HINTS ${R_ROOT_DIR}/lib
) )
else() else()
@ -30,8 +30,7 @@ set(R_LIBRARIES ${R_LIBRARY})
set(R_INCLUDE_DIRS ${R_INCLUDE_DIR}) set(R_INCLUDE_DIRS ${R_INCLUDE_DIR})
# find Rcpp include directory # find Rcpp include directory
execute_process(COMMAND echo "cat(find.package('Rcpp'))" execute_process(COMMAND Rscript -e "cat(system.file(package='Rcpp'))"
COMMAND ${R_EXE} --vanilla --slave
RESULT_VARIABLE RCPP_NOT_FOUND RESULT_VARIABLE RCPP_NOT_FOUND
ERROR_QUIET ERROR_QUIET
OUTPUT_VARIABLE RCPP_PATH OUTPUT_VARIABLE RCPP_PATH
@ -51,8 +50,7 @@ mark_as_advanced(R_Rcpp_INCLUDE_DIR)
list(APPEND R_INCLUDE_DIRS ${R_Rcpp_INCLUDE_DIR}) list(APPEND R_INCLUDE_DIRS ${R_Rcpp_INCLUDE_DIR})
# find RInside libraries and include path # find RInside libraries and include path
execute_process(COMMAND echo "cat(find.package('RInside'))" execute_process(COMMAND Rscript -e "cat(system.file(package='RInside'))"
COMMAND ${R_EXE} --vanilla --slave
RESULT_VARIABLE RINSIDE_NOT_FOUND RESULT_VARIABLE RINSIDE_NOT_FOUND
ERROR_QUIET ERROR_QUIET
OUTPUT_VARIABLE RINSIDE_PATH OUTPUT_VARIABLE RINSIDE_PATH