Revision: 41451
http://brlcad.svn.sourceforge.net/brlcad/?rev=41451&view=rev
Author: starseeker
Date: 2010-11-23 19:56:35 +0000 (Tue, 23 Nov 2010)
Log Message:
-----------
Switch to actually hunting down the init.tcl file based on the system tcl's
autopath list - not tested.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-11-23 19:47:36 UTC
(rev 41450)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-11-23 19:56:35 UTC
(rev 41451)
@@ -107,20 +107,22 @@
FILE(APPEND ${CONFIG_H_FILE} "#define TCL_SYSTEM_AUTO_PATH \"\"\n")
ELSE(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
BRLCAD_INCLUDE_FILE(tcl.h HAVE_TCL_H)
- # We're going to need the auto_path info from the system tcl for btclsh
and bwish
- SET(autopath_script "
-set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/tcl_autopath\"
+ # We're going to need the path to the system init.tcl for btclsh and
bwish
+ SET(inittcl_script "
+set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl\"
set fileID [open $filename \"w\"]
puts $fileID $auto_path
close $fileID
exit
")
- SET(autopath_scriptfile "${CMAKE_BINARY_DIR}/CMakeTmp/tcl_autopath.tcl")
- FILE(WRITE ${autopath_scriptfile} ${autopath_script})
- EXEC_PROGRAM(${TCL_TCLSH} ARGS ${autopath_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
- FILE(READ ${CMAKE_BINARY_DIR}/CMakeTmp/tcl_autopath tcl_autopath_raw)
- STRING(REGEX REPLACE "\n" "" tcl_autopath ${tcl_autopath_raw})
- FILE(APPEND ${CONFIG_H_FILE} "#define TCL_SYSTEM_AUTO_PATH
\"${tcl_autopath}\"\n")
+ SET(inittcl_scriptfile "${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl.tcl")
+ FILE(WRITE ${inittcl_scriptfile} ${inittcl_script})
+ EXEC_PROGRAM(${TCL_TCLSH} ARGS ${inittcl_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
+ FILE(READ ${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl tcl_inittcl_raw)
+ STRING(REGEX REPLACE "\n" "" tcl_inittcl_paths_1 ${tcl_inittcl_raw})
+ STRING(REGEX REPLACE " " ";" tcl_inittcl_paths ${tcl_inittcl_paths_1})
+ FIND_FILE(tcl_inittcl PATHS ${tcl_inittcl_paths})
+ FILE(APPEND ${CONFIG_H_FILE} "#define TCL_SYSTEM_INITTCL
\"${tcl_inittcl}\"\n")
ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
