[rkward/frameworks] rkward/rbackend/rpackages: Support Binary Directories With Spaces
David E. Narváez
null at kde.org
Sun Oct 22 13:28:13 UTC 2017
Git commit 2aae28318ff919bed0a3abb53bd175b9fb47571c by David E. Narváez.
Committed on 21/10/2017 at 02:31.
Pushed by narvaez into branch 'frameworks'.
Support Binary Directories With Spaces
Using quotes around the use of @CMAKE_CURRENT_BINARY_DIR@ fixes issues
when having a working dir with spaces in the name.
M +4 -4 rkward/rbackend/rpackages/rpackage_install.cmake.in
https://commits.kde.org/rkward/2aae28318ff919bed0a3abb53bd175b9fb47571c
diff --git a/rkward/rbackend/rpackages/rpackage_install.cmake.in b/rkward/rbackend/rpackages/rpackage_install.cmake.in
index f2772f6d..476a45de 100644
--- a/rkward/rbackend/rpackages/rpackage_install.cmake.in
+++ b/rkward/rbackend/rpackages/rpackage_install.cmake.in
@@ -17,16 +17,16 @@ IF(WIN32)
ENDIF(DESTDIR)
EXECUTE_PROCESS(
COMMAND @R_EXECUTABLE@ CMD INSTALL ${TIMESTAMPARG} -c -l ${R_LIBDIR} "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
- WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+ WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
)
ELSE(WIN32)
EXECUTE_PROCESS(
- COMMAND mkdir -p @CMAKE_CURRENT_BINARY_DIR@/tmp ${DESTDIR}/@R_LIBDIR@
+ COMMAND mkdir -p "@CMAKE_CURRENT_BINARY_DIR@/tmp" ${DESTDIR}/@R_LIBDIR@
)
EXECUTE_PROCESS(
- COMMAND env TMPDIR=@CMAKE_CURRENT_BINARY_DIR@/tmp @R_EXECUTABLE@ CMD INSTALL ${TIMESTAMPARG} -c -l ${DESTDIR}/@R_LIBDIR@ "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
- WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+ COMMAND env TMPDIR="@CMAKE_CURRENT_BINARY_DIR@/tmp" @R_EXECUTABLE@ CMD INSTALL ${TIMESTAMPARG} -c -l ${DESTDIR}/@R_LIBDIR@ "@CMAKE_CURRENT_SOURCE_DIR@/rkward" "@CMAKE_CURRENT_SOURCE_DIR@/rkwardtests"
+ WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
RESULT_VARIABLE R_LIB_INSTALL_EXIT_CODE
)
ENDIF(WIN32)
More information about the rkward-tracker
mailing list