Revision: 75761
http://sourceforge.net/p/brlcad/code/75761
Author: starseeker
Date: 2020-05-08 15:28:03 +0000 (Fri, 08 May 2020)
Log Message:
-----------
get_filename_component REALPATH doesn't do what we need here... manually adjust
names.
Modified Paths:
--------------
brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake
brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake
Modified: brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake
===================================================================
--- brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
+++ brlcad/trunk/src/other/itcl3/pkg_mkIndex.cmake 2020-05-08 15:28:03 UTC
(rev 75761)
@@ -32,14 +32,14 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-get_filename_component(TFD "${TF_DIR}" REALPATH)
-
+string(REPLACE "\\" "" TF_DIR ${TF_DIR})
+string(REPLACE "\\" "" INST_DIR ${INST_DIR})
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")
+file(APPEND "${WORKING_PKGFILE}" "package ifneeded itcl ${pkgversion} [list
load [file join $dir \"${TF_DIR}\" ${TF_NAME}] Itcl]\n")
+file(APPEND "${WORKING_PKGFILE}" "package ifneeded Itcl ${pkgversion} [list
load [file join $dir \"${TF_DIR}\" ${TF_NAME}] Itcl]\n")
file(WRITE "${INSTALL_PKGFILE}" "if {![package vsatisfies [package provide
Tcl] 8.6]} return\n")
Modified: brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake
===================================================================
--- brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake 2020-05-08 15:16:11 UTC
(rev 75760)
+++ brlcad/trunk/src/other/itk3/pkg_mkIndex.cmake 2020-05-08 15:28:03 UTC
(rev 75761)
@@ -32,15 +32,15 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-get_filename_component(TFD "${TF_DIR}" REALPATH)
-
+string(REPLACE "\\" "" TF_DIR ${TF_DIR})
+string(REPLACE "\\" "" INST_DIR ${INST_DIR})
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")
-file(APPEND "${WORKING_PKGFILE}" "package ifneeded itk ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] Itk]\n")
-file(APPEND "${WORKING_PKGFILE}" "package ifneeded Itk ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] Itk]\n")
+file(APPEND "${WORKING_PKGFILE}" "package ifneeded itk ${pkgversion} [list
load [file join $dir \"${TF_DIR}\" ${TF_NAME}] Itk]\n")
+file(APPEND "${WORKING_PKGFILE}" "package ifneeded Itk ${pkgversion} [list
load [file join $dir \"${TF_DIR}\" ${TF_NAME}] Itk]\n")
file(WRITE "${INSTALL_PKGFILE}" "if {![package vsatisfies [package provide
Tcl] 8.6]} 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
