Revision: 75586
http://sourceforge.net/p/brlcad/code/75586
Author: brlcad
Date: 2020-04-23 20:35:09 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
itk should be looking for tk, not tcl
Modified Paths:
--------------
brlcad/trunk/src/other/itk3/CMakeLists.txt
Modified: brlcad/trunk/src/other/itk3/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/itk3/CMakeLists.txt 2020-04-23 20:24:20 UTC (rev
75585)
+++ brlcad/trunk/src/other/itk3/CMakeLists.txt 2020-04-23 20:35:09 UTC (rev
75586)
@@ -42,9 +42,9 @@
# set CMake project name
project(ITK)
-if(NOT TCL_LIBRARY OR NOT TCL_INCLUDE_PATH OR NOT TK_LIBRARY)
- find_package(TCL)
-endif(NOT TCL_LIBRARY OR NOT TCL_INCLUDE_PATH OR NOT TK_LIBRARY)
+if(NOT TK_LIBRARY OR NOT TK_INCLUDE_PATH)
+ find_package(TK)
+endif(NOT TK_LIBRARY OR NOT TK_INCLUDE_PATH)
if(NOT TCL_STUB_LIBRARY OR NOT TK_STUB_LIBRARY OR NOT ITCL_STUB_LIBRARY)
if(TARGET tclsh)
@@ -190,6 +190,7 @@
# install of Tcl. The workaround is to use our local copies and hope they
# are workable. (Ugh.)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../tcl/generic)
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../tk/xlib)
if(NOT WIN32)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../tcl/unix)
else(NOT WIN32)
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