From 77d3746c5569ed853b3daaab88c84d82b54a4b1d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 3 May 2020 19:17:04 -0500 Subject: [PATCH 1/2] [R-package] add conda dir for LIBR_CORE_LIBRARY (fixes #3045) --- R-package/src/cmake/modules/FindLibR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R-package/src/cmake/modules/FindLibR.cmake b/R-package/src/cmake/modules/FindLibR.cmake index 0213af7c1979..00d442807ad7 100644 --- a/R-package/src/cmake/modules/FindLibR.cmake +++ b/R-package/src/cmake/modules/FindLibR.cmake @@ -176,7 +176,7 @@ set(LIBR_EXECUTABLE ${LIBR_EXECUTABLE} CACHE PATH "R executable") set(LIBR_INCLUDE_DIRS ${LIBR_INCLUDE_DIRS} CACHE PATH "R include directory") # where is R.so / R.dll / libR.so likely to be found? -set(LIBR_PATH_HINTS "${CMAKE_CURRENT_BINARY_DIR}" "${LIBR_HOME}/bin/${R_ARCH}" "${LIBR_HOME}/bin" "${LIBR_LIBRARIES}") +set(LIBR_PATH_HINTS "${CMAKE_CURRENT_BINARY_DIR}" "${LIBR_HOME}/lib" "${LIBR_HOME}/bin/${R_ARCH}" "${LIBR_HOME}/bin" "${LIBR_LIBRARIES}") # look for the core R library find_library( From e91eff9486a93b3c0b1f8a4c2466f3f74c551b5a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 3 May 2020 20:20:59 -0500 Subject: [PATCH 2/2] empty commit