From c9ba4d13913e7742e416ed82e7583a5646344cc7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 25 Mar 2020 14:36:08 -0500 Subject: [PATCH] minor fixes --- .appveyor.yml | 3 --- .ci/test_r_package_windows.ps1 | 1 + CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 63651fb9f1b7..0fbd8d88f8c1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,9 +16,6 @@ environment: - COMPILER: MINGW TASK: r-package R_WINDOWS_VERSION: 3.6.3 - - COMPILER: MSVC - TASK: r-package - R_WINDOWS_VERSION: 3.6.3 clone_depth: 5 diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index b416cae9eb11..f16ba1dc3d23 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -83,4 +83,5 @@ if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -Quiet) { Check-Output $False } +Write-Output "No issues were found checking the R package" Exit 0 diff --git a/CMakeLists.txt b/CMakeLists.txt index b28fade32694..a651cfbdf62c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,10 +310,8 @@ endif() if(BUILD_FOR_R) if(MSVC) # https://docs.microsoft.com/en-us/cpp/build/reference/link-input-files?redirectedfrom=MSDN&view=vs-2019 - TARGET_LINK_LIBRARIES(lightgbm ${CMAKE_CURRENT_BINARY_DIR}/R.lib) TARGET_LINK_LIBRARIES(_lightgbm ${CMAKE_CURRENT_BINARY_DIR}/R.lib) else() - TARGET_LINK_LIBRARIES(lightgbm ${LIBR_CORE_LIBRARY}) TARGET_LINK_LIBRARIES(_lightgbm ${LIBR_CORE_LIBRARY}) endif() endif(BUILD_FOR_R)