Revision: 75589
http://sourceforge.net/p/brlcad/code/75589
Author: starseeker
Date: 2020-04-23 21:22:26 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Just rely on find_package(TCL) - either it's finding what we need, or we're
setting it in src/other/CMakeLists.txt (or we need to fix something.)
Modified Paths:
--------------
brlcad/trunk/src/other/itcl3/CMakeLists.txt
Modified: brlcad/trunk/src/other/itcl3/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/itcl3/CMakeLists.txt 2020-04-23 21:17:15 UTC (rev
75588)
+++ brlcad/trunk/src/other/itcl3/CMakeLists.txt 2020-04-23 21:22:26 UTC (rev
75589)
@@ -42,25 +42,8 @@
# set CMake project name
project(ITCL)
-if(NOT TCL_LIBRARY OR NOT TCL_INCLUDE_PATH)
- find_package(TCL)
-endif(NOT TCL_LIBRARY OR NOT TCL_INCLUDE_PATH)
+find_package(TCL)
-if(NOT TCL_STUB_LIBRARY)
- if(TARGET tclsh)
- message(FATAL_ERROR "We're building tclsh, but TCL_STUB_LIBRARY isn't set
- this is most likely due to an error in the build system logic.")
- endif(TARGET tclsh)
- if(NOT TCL_TCLSH)
- find_program(TCL_TCLSH tclsh)
- endif(NOT TCL_TCLSH)
- if(NOT TCL_TCLSH)
- message(FATAL_ERROR "itcl enabled, but tclsh is not available and
TCL_STUB_LIBRARY is undefined. Either specify the location of the tcl stub
library (-DTCL_STUB_LIBRARY=/path/to/libtclstub86.a) or identify the location
of tclsh (-DTCL_TCLSH=/path/to/tclsh)")
- endif(NOT TCL_TCLSH)
- get_filename_component(TCLSH_DIR "${TCL_TCLSH}" DIRECTORY)
- get_filename_component(TCLSH_ROOT_DIR "${TCLSH_DIR}" DIRECTORY)
- find_library(TCL_STUB_LIBRARY tclstub NAMES tclstub86 tclstub8.6 HINTS
${TCLSH_ROOT_DIR}/lib)
-endif(NOT TCL_STUB_LIBRARY)
-
# version numbers
set(ITCL_VERSION_MAJOR 3)
set(ITCL_VERSION_MINOR 4)
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
