Revision: 75760
http://sourceforge.net/p/brlcad/code/75760
Author: starseeker
Date: 2020-05-08 15:16:11 +0000 (Fri, 08 May 2020)
Log Message:
-----------
New itcl/itk logic doesn't like the odd-pathnames test
Modified Paths:
--------------
brlcad/trunk/src/other/itcl3/ITCL_PKGINDEX.cmake
brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake
brlcad/trunk/src/other/itk3/ITK_PKGINDEX.cmake
brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake
Modified: brlcad/trunk/src/other/itcl3/ITCL_PKGINDEX.cmake
===================================================================
--- brlcad/trunk/src/other/itcl3/ITCL_PKGINDEX.cmake 2020-05-08 14:27:57 UTC
(rev 75759)
+++ brlcad/trunk/src/other/itcl3/ITCL_PKGINDEX.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
@@ -42,8 +42,8 @@
set(INST_DIR "${BIN_DIR}")
endif(MSVC)
- set(WORKING_PKGFILE
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LIB_DIR}/${pkgname}${pkgversion}/pkgIndex.tcl)
- set(INSTALL_PKGFILE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl)
+ set(WORKING_PKGFILE
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LIB_DIR}/${pkgname}${pkgversion}/pkgIndex.tcl")
+ set(INSTALL_PKGFILE "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl")
add_custom_command(OUTPUT ${WORKING_PKGFILE} ${INSTALL_PKGFILE}
COMMAND ${CMAKE_COMMAND} -DWORKING_PKGFILE="${WORKING_PKGFILE}"
-DINSTALL_PKGFILE="${INSTALL_PKGFILE}"
-DTF_NAME="$<TARGET_FILE_NAME:${target}>"
-DTF_DIR="$<TARGET_FILE_DIR:${target}>" -Dpkgname="${pkgname}"
-Dpkgversion="${pkgversion}" -DINST_DIR="${INST_DIR}" -P
${CMAKE_CURRENT_SOURCE_DIR}/pkg_mkIndex.cmake
Modified: brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake
===================================================================
--- brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake 2020-05-08 14:27:57 UTC
(rev 75759)
+++ brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
@@ -34,6 +34,9 @@
get_filename_component(TFD "${TF_DIR}" REALPATH)
+string(REPLACE "\\" "" WORKING_PKGFILE ${WORKING_PKGFILE})
+string(REPLACE "\\" "" INSTALL_PKGFILE ${INSTALL_PKGFILE})
+
file(WRITE "${WORKING_PKGFILE}" "if {![package vsatisfies [package provide
Tcl] 8.6]} return\n")
file(APPEND "${WORKING_PKGFILE}" "package ifneeded itcl ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] Itcl]\n")
file(APPEND "${WORKING_PKGFILE}" "package ifneeded Itcl ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] Itcl]\n")
Modified: brlcad/trunk/src/other/itk3/ITK_PKGINDEX.cmake
===================================================================
--- brlcad/trunk/src/other/itk3/ITK_PKGINDEX.cmake 2020-05-08 14:27:57 UTC
(rev 75759)
+++ brlcad/trunk/src/other/itk3/ITK_PKGINDEX.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
@@ -42,8 +42,8 @@
set(INST_DIR "${BIN_DIR}")
endif(MSVC)
- set(WORKING_PKGFILE
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LIB_DIR}/${pkgname}${pkgversion}/pkgIndex.tcl)
- set(INSTALL_PKGFILE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl)
+ set(WORKING_PKGFILE
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LIB_DIR}/${pkgname}${pkgversion}/pkgIndex.tcl")
+ set(INSTALL_PKGFILE "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl")
add_custom_command(OUTPUT ${WORKING_PKGFILE} ${INSTALL_PKGFILE}
COMMAND ${CMAKE_COMMAND} -DWORKING_PKGFILE="${WORKING_PKGFILE}"
-DINSTALL_PKGFILE="${INSTALL_PKGFILE}"
-DTF_NAME="$<TARGET_FILE_NAME:${target}>"
-DTF_DIR="$<TARGET_FILE_DIR:${target}>" -Dpkgname="${pkgname}"
-Dpkgversion="${pkgversion}" -DINST_DIR="${INST_DIR}" -P
${CMAKE_CURRENT_SOURCE_DIR}/pkg_mkIndex.cmake
Modified: brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake
===================================================================
--- brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake 2020-05-08 14:27:57 UTC
(rev 75759)
+++ brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
@@ -34,6 +34,8 @@
get_filename_component(TFD "${TF_DIR}" REALPATH)
+string(REPLACE "\\" "" WORKING_PKGFILE ${WORKING_PKGFILE})
+string(REPLACE "\\" "" INSTALL_PKGFILE ${INSTALL_PKGFILE})
file(WRITE "${WORKING_PKGFILE}" "if {![package vsatisfies [package provide
Tcl] 8.6]} return\n")
file(APPEND "${WORKING_PKGFILE}" "if {[string length [package provide Itcl]]
&& ![package vsatisfies [package provide Itcl] 3.4]} return\n")
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
