Revision: 75574
http://sourceforge.net/p/brlcad/code/75574
Author: starseeker
Date: 2020-04-23 16:23:46 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Don't know if this really helps, but try to work around the issue warned about
calling FindTCL in more modern CMake. (This is an issue in their own default
FindTCL.cmake module, not ours.)
Modified Paths:
--------------
brlcad/trunk/misc/CMake/ThirdParty.cmake
Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty.cmake 2020-04-23 15:50:05 UTC (rev
75573)
+++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2020-04-23 16:23:46 UTC (rev
75574)
@@ -191,6 +191,15 @@
set(${varname_root}_FIND_QUIETLY TRUE)
endif("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
+ # In the case of Tcl, more modern versions of CMake will first try to look
for Tclsh using a
+ # different find package call. This produces a warning about looking for
one package while
+ # calling with a different name, so if we're looking for TCL do the Tclsh
search ourselves
+ # up front
+ if ("${TP_FIND_NAME}" STREQUAL "TCL")
+ find_package(Tclsh NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+ find_package(Wish NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+ endif ("${TP_FIND_NAME}" STREQUAL "TCL")
+
# Find the package in question. It is the toplevel CMakeLists.txt's
responsibility to make
# sure that the CMAKE_MODULE_PATH variable is set correctly if there are
local versions of
# Find*.cmake scripts that should be used. Note that newer CMake versions
will prefer a system
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
