[rkward/frameworks] rkward/rbackend: Add top level project dir to libR search path. This is where we generate R.lib for MSVC in the emerge build script.

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Sat Feb 27 19:10:48 UTC 2016


Git commit ebaef8abb2ce6f12b458449518260291988ef774 by Thomas Friedrichsmeier.
Committed on 27/02/2016 at 19:09.
Pushed by tfry into branch 'frameworks'.

Add top level project dir to libR search path. This is where we generate R.lib for MSVC in the emerge build script.

Hooray: Can now be built with MSVC (and does not crash, immediately...)

M  +1    -1    rkward/rbackend/FindR.cmake

http://commits.kde.org/rkward/ebaef8abb2ce6f12b458449518260291988ef774

diff --git a/rkward/rbackend/FindR.cmake b/rkward/rbackend/FindR.cmake
index 867b1bf..e8dca1c 100644
--- a/rkward/rbackend/FindR.cmake
+++ b/rkward/rbackend/FindR.cmake
@@ -89,7 +89,7 @@ SET(R_INCLUDEDIR ${R_INCLUDEDIR} ${R_INCLUDEDIR}/${R_ARCH})
 MESSAGE(STATUS "Checking for existence of R shared library")
 FIND_LIBRARY(LIBR_SO
 	R
-	PATHS ${R_HOME}/lib ${R_SHAREDLIBDIR} ${R_HOME}/bin ${R_HOME}/bin/${R_ARCH} ${R_HOME}/lib/${R_ARCH}
+	PATHS ${R_HOME}/lib ${R_SHAREDLIBDIR} ${R_HOME}/bin ${R_HOME}/bin/${R_ARCH} ${R_HOME}/lib/${R_ARCH} ${PROJECT_BINARY_DIR}
 	NO_DEFAULT_PATH)
 IF(NOT LIBR_SO)
 	MESSAGE(FATAL_ERROR "Not found. Make sure the location of R was detected correctly, above, and R was compiled with the --enable-R-shlib option")



More information about the rkward-tracker mailing list