Revision: 77719
http://sourceforge.net/p/brlcad/code/77719
Author: starseeker
Date: 2020-11-10 19:29:05 +0000 (Tue, 10 Nov 2020)
Log Message:
-----------
Problem wasn't what I thought - had to do with unwittingly employing two
quoting mechanisms simultaneously. Had surrounded paths with double quotes,
but internally spaces were backslash escaped already. Combination resulted in
a non-existant path being set.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-10 17:16:20 UTC (rev 77718)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-10 19:29:05 UTC (rev 77719)
@@ -27,17 +27,7 @@
file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake" "
get_filename_component(DNAME \"\${DEST}\" NAME)
string(REGEX REPLACE \"\${DNAME}$\" \"\" DDIR \"\${DEST}\")
-if (NOT WIN32)
- string(REPLACE \"\\\\ \" \" \" SDIR \"\${SRC}\")
- string(REPLACE \"\\\\ \" \" \" DDIR \"\${DDIR}\")
- execute_process(COMMAND mkdir -p \${DDIR})
- execute_process(COMMAND cp \${SDIR} \${DDIR} RESULT_VARIABLE CPRESULT)
- if (CPRESULT)
- message(FATAL_ERROR \"COPY FAILURE: cp \${SDIR} \${DDIR}\")
- endif (CPRESULT)
-else (NOT WIN32)
- file(COPY \"\${SRC}\" DESTINATION \"\${DDIR}\")
-endif (NOT WIN32)
+file(COPY \"\${SRC}\" DESTINATION \"\${DDIR}\")
")
# When staging files in the build directory, we have to be aware of multiple
@@ -52,7 +42,7 @@
if (CMAKE_CONFIGURATION_TYPES)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}"
- COMMAND ${CMAKE_COMMAND} -DSRC="${root}/${rdir}/${ofile}"
-DDEST="${CMAKE_BINARY_DIR}/$<CONFIG>/${rdir}/${tfile}" -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
+ COMMAND ${CMAKE_COMMAND} -DSRC=${root}/${rdir}/${ofile}
-DDEST=${CMAKE_BINARY_DIR}/$<CONFIG>/${rdir}/${tfile} -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
DEPENDS ${extproj}
)
set(TOUT ${TOUT}
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}")
@@ -59,7 +49,7 @@
else (CMAKE_CONFIGURATION_TYPES)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${rdir}/${tfile}"
- COMMAND ${CMAKE_COMMAND} -DSRC="${root}/${rdir}/${ofile}"
-DDEST="${CMAKE_BINARY_DIR}/${rdir}/${tfile}" -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
+ COMMAND ${CMAKE_COMMAND} -DSRC=${root}/${rdir}/${ofile}
-DDEST=${CMAKE_BINARY_DIR}/${rdir}/${tfile} -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
DEPENDS ${extproj}
)
set(TOUT ${TOUT} "${CMAKE_BINARY_DIR}/${rdir}/${tfile}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
