Revision: 75570
http://sourceforge.net/p/brlcad/code/75570
Author: starseeker
Date: 2020-04-23 15:12:40 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Doesn't look like we'll be using itcl/itk 4 in the near term - simplify the
build
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/src/other/itcl/
brlcad/trunk/src/other/itcl.dist
brlcad/trunk/src/other/itk/
brlcad/trunk/src/other/itk.dist
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 04:21:43 UTC (rev
75569)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 15:12:40 UTC (rev
75570)
@@ -400,24 +400,24 @@
else(BRLCAD_TCL_BUILD)
get_filename_component(TCL_LIB_PATH "${TCL_LIBRARY}" DIRECTORY)
find_library(TCL_STUB_LIBRARY tclstub NAMES tclstub86 tclstub8.6 PATHS
${TCL_LIB_PATH})
- BRLCAD_INCLUDE_FILE(tcl.h HAVE_TCL_H)
- # 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(inittcl_scriptfile "${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl.tcl")
- file(WRITE ${inittcl_scriptfile} ${inittcl_script})
+ BRLCAD_INCLUDE_FILE(tcl.h HAVE_TCL_H)
+ # 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(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)
+ 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_path(tcl_inittcl NAMES init.tcl PATHS ${tcl_inittcl_paths})
- mark_as_advanced(tcl_inittcl)
- CONFIG_H_APPEND(BRLCAD "#define TCL_SYSTEM_INITTCL_PATH
\"${tcl_inittcl}\"\n")
+ mark_as_advanced(tcl_inittcl)
+ CONFIG_H_APPEND(BRLCAD "#define TCL_SYSTEM_INITTCL_PATH
\"${tcl_inittcl}\"\n")
endif(BRLCAD_TCL_BUILD)
mark_as_advanced(TCL_COMPILATION_TRACING)
mark_as_advanced(TCL_COMPILE_STATS)
@@ -513,25 +513,13 @@
#
# http://core.tcl.tk/itcl/tktview/61952ca33e9e58df9e0519a0b4583a144e8ec77b
#
-# We're set up below to use either v3 or v4, depending on which of the below
-# variables are uncommented
+# Consequently we need to provide the older v3
set(ITCL_DIR itcl3)
set(ITCL_VER "3.4")
-include("${CMAKE_CURRENT_SOURCE_DIR}/itcl.dist")
-CMAKEFILES_IN_DIR(itcl_ignore_files itcl)
-#set(ITCL_DIR itcl)
-#set(ITCL_VER "4.2.0")
include("${CMAKE_CURRENT_SOURCE_DIR}/itcl3.dist")
CMAKEFILES_IN_DIR(itcl3_ignore_files itcl3)
-
-
set(ITK_DIR itk3)
set(ITK_VER "3.4")
-include("${CMAKE_CURRENT_SOURCE_DIR}/itk.dist")
-CMAKEFILES_IN_DIR(itk_ignore_files itk)
-
-#set(ITK_DIR itk)
-#set(ITK_VER "4.1.0")
include("${CMAKE_CURRENT_SOURCE_DIR}/itk3.dist")
CMAKEFILES_IN_DIR(itk3_ignore_files itk3)
Deleted: brlcad/trunk/src/other/itcl.dist
===================================================================
--- brlcad/trunk/src/other/itcl.dist 2020-04-23 04:21:43 UTC (rev 75569)
+++ brlcad/trunk/src/other/itcl.dist 2020-04-23 15:12:40 UTC (rev 75570)
@@ -1,40 +0,0 @@
-set(itcl_ignore_files
-CMakeLists.txt
-ITCL_PKGINDEX.cmake
-generic/itcl.decls
-generic/itcl.h
-generic/itcl2TclOO.c
-generic/itcl2TclOO.h
-generic/itclBase.c
-generic/itclBuiltin.c
-generic/itclClass.c
-generic/itclCmd.c
-generic/itclDecls.h
-generic/itclEnsemble.c
-generic/itclHelpers.c
-generic/itclInfo.c
-generic/itclInt.h
-generic/itclIntDecls.h
-generic/itclLinkage.c
-generic/itclMethod.c
-generic/itclMigrate2TclCore.c
-generic/itclMigrate2TclCore.h
-generic/itclObject.c
-generic/itclParse.c
-generic/itclResolve.c
-generic/itclStubInit.c
-generic/itclStubLib.c
-generic/itclStubs.c
-generic/itclTclIntStubsFcn.c
-generic/itclTclIntStubsFcn.h
-generic/itclTestRegisterC.c
-generic/itclUtil.c
-library/itcl.tcl
-library/itclHullCmds.tcl
-library/itclWidget.tcl
-license.terms
-pkg_mkIndex.cmake
-win/dllEntryPoint.c
-win/itcl.rc
-win/toaster.bmp
-)
Deleted: brlcad/trunk/src/other/itk.dist
===================================================================
--- brlcad/trunk/src/other/itk.dist 2020-04-23 04:21:43 UTC (rev 75569)
+++ brlcad/trunk/src/other/itk.dist 2020-04-23 15:12:40 UTC (rev 75570)
@@ -1,31 +0,0 @@
-set(itk_ignore_files
-CMakeLists.txt
-ITK_PKGINDEX.cmake
-generic/itk.decls
-generic/itk.h
-generic/itkArchBase.c
-generic/itkArchetype.c
-generic/itkBase.c
-generic/itkCmd.c
-generic/itkDecls.h
-generic/itkHelpers.c
-generic/itkInt.h
-generic/itkIntDecls.h
-generic/itkOption.c
-generic/itkStubInit.c
-generic/itkStubLib.c
-generic/itkUtil.c
-library/Archetype.itk
-library/Toplevel.itk
-library/Widget.itk
-library/itk.tcl
-library/tclIndex
-license.terms
-pkgIndex.tcl.in
-pkg_mkIndex.cmake
-win/dllEntryPoint.c
-win/nmakehlp.c
-win/rc/itk.ico
-win/rc/itk.rc
-win/toaster.bmp
-)
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
