Revision: 77933
http://sourceforge.net/p/brlcad/code/77933
Author: starseeker
Date: 2020-12-05 18:26:54 +0000 (Sat, 05 Dec 2020)
Log Message:
-----------
Work around an issue passing in spaces in pathnames.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
Modified: brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
===================================================================
--- brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake 2020-12-04 20:07:57 UTC
(rev 77932)
+++ brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake 2020-12-05 18:26:54 UTC
(rev 77933)
@@ -31,11 +31,24 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-
get_filename_component(TFD "${TF_DIR}" REALPATH)
-file(WRITE "${WORKING_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir \"${TFD}\" ${TF_NAME}] ${pkgname}]")
-file(WRITE "${INSTALL_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir .. .. \"${INST_DIR}\" ${TF_NAME}] ${pkgname}]")
+# file(WRITE) is digesting the paths and producing incorrect directories
+# when there are spaces in paths. To avoid this, use get_filename_component
+# to "pre-digest" the paths and then correct any "/ " patterns introduced.
+get_filename_component(WFD "${WORKING_PKGFILE}" DIRECTORY)
+get_filename_component(WFN "${WORKING_PKGFILE}" NAME)
+string(REPLACE "/ " " " WFD "${WFD}")
+file(WRITE "${WFD}/${WFN}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] ${pkgname}]")
+
+# file(WRITE) is digesting the paths and producing incorrect directories
+# when there are spaces in paths. To avoid this, use get_filename_component
+# to "pre-digest" the paths and then correct any "/ " patterns introduced.
+get_filename_component(WFD "${INSTALL_PKGFILE}" DIRECTORY)
+get_filename_component(WFN "${INSTALL_PKGFILE}" NAME)
+string(REPLACE "/ " " " WFD "${WFD}")
+file(WRITE "${WFD}/${WFN}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir .. .. \"${INST_DIR}\" ${TF_NAME}] ${pkgname}]")
+
# Local Variables:
# tab-width: 8
# mode: cmake
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
