removed some duplication in cmake scripts

microsoft · Mar 17, 2020 · 73eafe5 · 73eafe5
1 parent fe136d9
commit 73eafe5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,11 +73,12 @@ endif(USE_R35)
 
 if(BUILD_FOR_R)
     list(APPEND CMAKE_MODULE_PATH "${lightgbm_SOURCE_DIR}/cmake/modules")
-    set(CMAKE_R_VERSION ${CMAKE_R_VERSION})
-    message(STATUS "Passed-in R version: " ${CMAKE_R_VERSION})
     find_package(LibR REQUIRED)
-    message(STATUS "LIBR_CORE_LIBRARY: " ${LIBR_CORE_LIBRARY})
-    message(STATUS "LIBR_INCLUDE_DIRS " ${LIBR_INCLUDE_DIRS})
+    message(STATUS "LIBR_HOME [${LIBR_HOME}]")
+    message(STATUS "LIBR_EXECUTABLE [${LIBR_EXECUTABLE}]")
+    message(STATUS "LIBR_INCLUDE_DIRS [${LIBR_INCLUDE_DIRS}]")
+    message(STATUS "LIBR_LIB_DIR [${LIBR_LIB_DIR}]")
+    message(STATUS "LIBR_CORE_LIBRARY [${LIBR_CORE_LIBRARY}]")
     include_directories(${LIBR_INCLUDE_DIRS})
     ADD_DEFINITIONS(-DLGB_R_BUILD)
 endif(BUILD_FOR_R)

diff --git a/R-package/src/cmake/modules/FindLibR.cmake b/R-package/src/cmake/modules/FindLibR.cmake
@@ -83,9 +83,9 @@ if(APPLE)
       COMMAND ${LIBR_EXECUTABLE} "--slave" "--vanilla" "-e" "cat(R.home())"
       OUTPUT_VARIABLE LIBR_HOME
     )
-    set(LIBR_HOME ${LIBR_HOME} CACHE PATH "R home directory")
-    set(LIBR_INCLUDE_DIRS "${LIBR_HOME}/include" CACHE PATH "R include directory")
-    set(LIBR_LIB_DIR "${LIBR_HOME}/lib" CACHE PATH "R lib directory")
+    set(LIBR_HOME ${LIBR_HOME})
+    set(LIBR_INCLUDE_DIRS "${LIBR_HOME}/include")
+    set(LIBR_LIB_DIR "${LIBR_HOME}/lib")
   endif()
 
 # detection for UNIX & Win32
@@ -100,7 +100,7 @@ else()
     find_program(
       LIBR_EXECUTABLE
       NO_DEFAULT_PATH
-      HINTS "${CMAKE_CURRENT_BINARY_DIR}" "/usr/bin" "/usr/lib/"
+      HINTS "${CMAKE_CURRENT_BINARY_DIR}" "/usr/bin" "/usr/lib/" "/usr/local/bin/"
       NAMES R R.exe
     )
 
@@ -180,12 +180,6 @@ else()
     set(LIBR_INCLUDE_DIRS "${LIBR_HOME}/include")
     set(LIBR_LIB_DIR "${LIBR_HOME}/bin/${R_ARCH}")
 
-    message(STATUS "LIBR_HOME [${LIBR_HOME}]")
-    message(STATUS "LIBR_EXECUTABLE [${LIBR_EXECUTABLE}]")
-    message(STATUS "LIBR_INCLUDE_DIRS [${LIBR_INCLUDE_DIRS}]")
-    message(STATUS "LIBR_LIB_DIR [${LIBR_LIB_DIR}]")
-    message(STATUS "LIBR_CORE_LIBRARY [${LIBR_CORE_LIBRARY}]")
-
   endif()
 
 endif()
@@ -221,7 +215,6 @@ find_package_handle_standard_args(LibR DEFAULT_MSG
   LIBR_EXECUTABLE
   LIBR_INCLUDE_DIRS
   LIBR_LIB_DIR
-  LIBR_CORE_LIBRARY
 )
 
 if(LIBR_FOUND)