Revision: 75753
http://sourceforge.net/p/brlcad/code/75753
Author: starseeker
Date: 2020-05-08 02:09:16 +0000 (Fri, 08 May 2020)
Log Message:
-----------
If we're not using Tk at all, force the Tk variables to empty
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-05-08 01:08:14 UTC (rev
75752)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-05-08 02:09:16 UTC (rev
75753)
@@ -467,6 +467,17 @@
endif (NOT WIN32)
set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphics type" FORCE)
+else(BRLCAD_TK_BUILD)
+
+ # If we're not using Tk, make sure the variables are empty - CMake won't be
+ # happy if they're set to NOTFOUND and used, and FindTCL.cmake may have set
+ # them.
+ set(TK_LIBRARY "" CACHE STRING "TK_LIBRARY" FORCE)
+ set(TK_STUB_LIBRARY "" CACHE STRING "TK_LIBRARY" FORCE)
+ set(TK_WISH "" CACHE STRING "TK_WISH" FORCE)
+ set(TK_INCLUDE_PATH "" CACHE STRING "Tk include path" FORCE)
+ set(TK_SYSTEM_GRAPHICS "" CACHE STRING "Tk system graphics type" FORCE)
+
endif(BRLCAD_TK_BUILD)
mark_as_advanced(TK_INCLUDE_PATH)
mark_as_advanced(TK_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
