Revision: 75903
http://sourceforge.net/p/brlcad/code/75903
Author: starseeker
Date: 2020-05-23 21:46:44 +0000 (Sat, 23 May 2020)
Log Message:
-----------
Use unset(var CACHE) - shorter than explicitly forcing the value to empty in
the cache, and seems to have the same result for the find_package cycle.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindTCL.cmake
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindTCL.cmake 2020-05-23 21:39:24 UTC (rev
75902)
+++ brlcad/trunk/misc/CMake/FindTCL.cmake 2020-05-23 21:46:44 UTC (rev
75903)
@@ -298,23 +298,23 @@
# If we have no information about the windowing system or it does not
match
# a specified system, the find_package detection has failed
if (NOT "${WSYS}" STREQUAL "${TK_SYSTEM_GRAPHICS}")
- set(TCL_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TCL_STUB_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TK_LIBRARY "" CACHE STRING "Graphics system mismatch" FORCE)
- set(TK_STUB_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TCL_FOUND FALSE CACHE BOOL "Graphics system mismatch" FORCE)
- set(TK_FOUND FALSE CACHE BOOL "Graphics system mismatch" FORCE)
- set(TCLTK_FOUND FALSE CACHE BOOL "Graphics system mismatch"
FORCE)
- set(TCLSH_FOUND FALSE CACHE BOOL "Graphics system mismatch"
FORCE)
- set(TCL_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TCL_INCLUDE_PATH "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TCL_TCLSH "" CACHE STRING "Graphics system mismatch" FORCE)
- set(TK_LIBRARY "" CACHE STRING "Graphics system mismatch" FORCE)
- set(TK_INCLUDE_PATH "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TK_WISH "" CACHE STRING "Graphics system mismatch" FORCE)
- set(TCL_STUB_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TK_STUB_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
- set(TTK_STUB_LIBRARY "" CACHE STRING "Graphics system mismatch"
FORCE)
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TCL_FOUND CACHE)
+ unset(TK_FOUND CACHE)
+ unset(TCLTK_FOUND CACHE)
+ unset(TCLSH_FOUND CACHE)
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_INCLUDE_PATH CACHE)
+ unset(TCL_TCLSH CACHE)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_INCLUDE_PATH CACHE)
+ unset(TK_WISH CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TTK_STUB_LIBRARY CACHE)
endif (NOT "${WSYS}" STREQUAL "${TK_SYSTEM_GRAPHICS}")
endif (NOT "${TK_SYSTEM_GRAPHICS}" STREQUAL "" AND TK_WISH AND NOT TARGET
"${TK_WISH}")
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-05-23 21:39:24 UTC (rev
75902)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-05-23 21:46:44 UTC (rev
75903)
@@ -320,12 +320,23 @@
endif(BRLCAD_ENABLE_AQUA)
# Make sure we actually look for these each time...
-unset(TCL_TCLSH CACHE)
unset(TCL_LIBRARY CACHE)
+unset(TCL_STUB_LIBRARY CACHE)
+unset(TK_LIBRARY CACHE)
+unset(TK_STUB_LIBRARY CACHE)
+unset(TCL_FOUND CACHE)
+unset(TK_FOUND CACHE)
+unset(TCLTK_FOUND CACHE)
+unset(TCLSH_FOUND CACHE)
+unset(TCL_LIBRARY CACHE)
unset(TCL_INCLUDE_PATH CACHE)
-unset(TK_WISH CACHE)
+unset(TCL_TCLSH CACHE)
unset(TK_LIBRARY CACHE)
unset(TK_INCLUDE_PATH CACHE)
+unset(TK_WISH CACHE)
+unset(TCL_STUB_LIBRARY CACHE)
+unset(TK_STUB_LIBRARY CACHE)
+unset(TTK_STUB_LIBRARY CACHE)
set(tcl_DESCRIPTION "
Option for enabling and disabling compilation of the Tcl library
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
