more robust invocation of dll2lib.R

cmake/modules/FindLibR.cmake

@@ -122,9 +122,29 @@ else()
 
  # call dll2lib.R to ensure export files are generated
  execute_process(
- COMMAND "${LIBR_HOME}/bin/${LIBR_ARCH}/Rscript.exe" "dll2lib.R"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tools"
- RESULT_VARIABLE LIBR_DLL2LIB_RESULT)
+
+ COMMAND
+ "${LIBR_HOME}/bin/${LIBR_ARCH}/Rscript.exe"
+ "dll2lib.R"
+ "${CMAKE_C_COMPILER}"
+
+ WORKING_DIRECTORY
+ "${CMAKE_CURRENT_SOURCE_DIR}/tools"
+
+ OUTPUT_VARIABLE
+ LIBR_DLL2LIB_STDOUT
+
+ ERROR_VARIABLE
+ LIBR_DLL2LIB_STDERR
+
+ RESULT_VARIABLE
+ LIBR_DLL2LIB_RESULT)
+
+ if(NOT LIBR_DLL2LIB_RESULT EQUAL 0)
+ message(STATUS "${LIBR_DLL2LIB_STDOUT}")
+ message(STATUS "${LIBR_DLL2LIB_STDERR}")
+ message(FATAL_ERROR "Failed to generate .lib files for R DLLs!")
+ endif()
 
  endif()
 

src/cpp/tools/dll2lib.R

@@ -1,29 +1,7 @@
+args <- commandArgs(TRUE)
 
-# Put MSVC tools on the PATH.
-# TODO: let CMake set this path for us
-dirs <- c(
-
- # for Jenkins
- "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.14.26428/bin/HostX64/x64",
- "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.15.26726/bin/HostX64/x64",
-
- # for local installs
- "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.14.26428/bin/HostX64/x64",
- "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.15.26726/bin/HostX64/x64"
-
-)
-
-found <- FALSE
-for (dir in dirs) {
- if (file.exists(dir)) {
- Sys.setenv(PATH = paste(dir, Sys.getenv("PATH"), sep = ";"))
- found <- TRUE
- break
- }
-}
-
-if (!found)
- stop("Failed to discover path to MSVC 2017 tools")
+# Put the path containing the C compiler on the PATH.
+Sys.setenv(PATH = paste(dirname(args[1]), Sys.getenv("PATH"), sep = ";"))
 
 # Find R DLLs.
 dlls <- list.files(R.home("bin"), pattern = "dll$", full.names = TRUE)