Revision: 75572
http://sourceforge.net/p/brlcad/code/75572
Author: starseeker
Date: 2020-04-23 15:40:16 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Make sure the relevant variables are zeroed out before starting the Tcl/Tk
search, so we don't get strange results on a repeat configure.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/tcl/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 15:13:57 UTC (rev
75571)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 15:40:16 UTC (rev
75572)
@@ -372,6 +372,12 @@
# Tcl/Tk and related extensions
####################################################################
+# Make sure we actually look for these...
+set(TCL_TCLSH "")
+set(TCL_LIBRARY "")
+set(TK_WISH "")
+set(TK_LIBRARY "")
+
set(tcl_DESCRIPTION "
Option for enabling and disabling compilation of the Tcl library
provided with BRL-CAD's source code. Default is AUTO, responsive to
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-04-23 15:13:57 UTC (rev
75571)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-04-23 15:40:16 UTC (rev
75572)
@@ -1092,16 +1092,16 @@
set(TCL_GENERIC_SRCS ${TCL_GENERIC_SRCS} generic/tclTomMathInterface.c)
endif (TCL_TOMMATH)
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
-SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
+set_property(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
set(TCL_OO_SRCS
@@ -1236,8 +1236,8 @@
unix/tclUnixTime.c
)
-SET_PROPERTY(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-SET_PROPERTY(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
+set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+set_property(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
set(TCL_NOTIFY_SRCS
unix/tclUnixNotfy.c
@@ -1350,10 +1350,10 @@
endif (NOT CMAKE_CONFIGURATION_TYPES)
endforeach(hdrfile ${TCL_HDRS})
-MARK_AS_ADVANCED(TCL_LIBRARIES TCL_CONF_PREFIX TCL_INCLUDE_PATH
TCL_INCLUDE_PATH)
-MARK_AS_ADVANCED(TCL_STUB_LIBRARIES TCL_TCLSH TCL_TCLSH_EXECUTABLE)
-MARK_AS_ADVANCED(TCL_TK_CONF_PREFIX TCL_TOMMATH)
-MARK_AS_ADVANCED(TCL_VERSION_MAJOR TCL_VERSION_MINOR TCL_WISH_EXECUTABLE)
+mark_as_advanced(TCL_LIBRARIES TCL_CONF_PREFIX TCL_INCLUDE_PATH
TCL_INCLUDE_PATH)
+mark_as_advanced(TCL_STUB_LIBRARIES TCL_TCLSH TCL_TCLSH_EXECUTABLE)
+mark_as_advanced(TCL_TK_CONF_PREFIX TCL_TOMMATH)
+mark_as_advanced(TCL_VERSION_MAJOR TCL_VERSION_MINOR TCL_WISH_EXECUTABLE)
# Local Variables:
# tab-width: 8
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
