From bb70787645411929699a83da4e444371427eeb76 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 25 Mar 2020 10:44:31 -0500
Subject: [PATCH] cleaned up handling of R package

---
 CMakeLists.txt                   | 6 ++++--
 windows/LightGBM.vcxproj         | 3 ---
 windows/LightGBM.vcxproj.filters | 9 ---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7782d636f85e..e208f3460c14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,14 +235,16 @@ file(GLOB SOURCES
 )
 
 add_executable(lightgbm src/main.cpp ${SOURCES})
+set(SOURCES "${SOURCES} src/c_api.cpp")
 
-add_library(_lightgbm SHARED src/c_api.cpp ${SOURCES})
 # Only build the R part of the library if building for
 # use with the R package
 if(BUILD_FOR_R)
-  add_library(_lightgbm SHARED src/lightgbm_R.cpp)
+  set(SOURCES "${SOURCES} lightgbm_R.cpp")
 endif(BUILD_FOR_R)
 
+add_library(_lightgbm SHARED ${SOURCES})
+
 if(MSVC)
     set_target_properties(_lightgbm PROPERTIES OUTPUT_NAME "lib_lightgbm")
 endif(MSVC)
diff --git a/windows/LightGBM.vcxproj b/windows/LightGBM.vcxproj
index 6e15af50c5f6..0f814a341977 100644
--- a/windows/LightGBM.vcxproj
+++ b/windows/LightGBM.vcxproj
@@ -237,13 +237,11 @@
     <ClInclude Include="..\include\LightGBM\dataset.h" />
     <ClInclude Include="..\include\LightGBM\dataset_loader.h" />
     <ClInclude Include="..\include\LightGBM\feature_group.h" />
-    <ClInclude Include="..\include\LightGBM\lightgbm_R.h" />
     <ClInclude Include="..\include\LightGBM\meta.h" />
     <ClInclude Include="..\include\LightGBM\metric.h" />
     <ClInclude Include="..\include\LightGBM\network.h" />
     <ClInclude Include="..\include\LightGBM\objective_function.h" />
     <ClInclude Include="..\include\LightGBM\prediction_early_stop.h" />
-    <ClInclude Include="..\include\LightGBM\R_object_helper.h" />
     <ClInclude Include="..\include\LightGBM\tree.h" />
     <ClInclude Include="..\include\LightGBM\tree_learner.h" />
     <ClInclude Include="..\include\LightGBM\utils\array_args.h" />
@@ -308,7 +306,6 @@
     <ClCompile Include="..\src\io\metadata.cpp" />
     <ClCompile Include="..\src\io\parser.cpp" />
     <ClCompile Include="..\src\io\tree.cpp" />
-    <ClCompile Include="..\src\lightgbm_R.cpp" />
     <ClCompile Include="..\src\metric\dcg_calculator.cpp" />
     <ClCompile Include="..\src\metric\metric.cpp" />
     <ClCompile Include="..\src\network\network.cpp" />
diff --git a/windows/LightGBM.vcxproj.filters b/windows/LightGBM.vcxproj.filters
index 11852bcb986d..f122c865afee 100644
--- a/windows/LightGBM.vcxproj.filters
+++ b/windows/LightGBM.vcxproj.filters
@@ -183,12 +183,6 @@
     <ClInclude Include="..\src\metric\map_metric.hpp">
       <Filter>src\metric</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\LightGBM\lightgbm_R.h">
-      <Filter>include\LightGBM</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\LightGBM\R_object_helper.h">
-      <Filter>include\LightGBM</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\boosting\rf.hpp">
       <Filter>src\boosting</Filter>
     </ClInclude>
@@ -296,9 +290,6 @@
     <ClCompile Include="..\src\boosting\prediction_early_stop.cpp">
       <Filter>src\boosting</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lightgbm_R.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\boosting\gbdt_model_text.cpp">
       <Filter>src\boosting</Filter>
     </ClCompile>