Revision: 77931
http://sourceforge.net/p/brlcad/code/77931
Author: starseeker
Date: 2020-12-04 18:49:21 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
Supply and use ITK_VERSION, instead of assuming ITCL and ITK match exactly.
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/auto_path.c
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/libtclcad/auto_path.c
===================================================================
--- brlcad/trunk/src/libtclcad/auto_path.c 2020-12-04 18:43:29 UTC (rev
77930)
+++ brlcad/trunk/src/libtclcad/auto_path.c 2020-12-04 18:49:21 UTC (rev
77931)
@@ -149,9 +149,11 @@
p = bu_strdup(bu_vls_cstr(&buffer));
bu_ptbl_ins(&lib_subpaths, (long *)p);
+#ifdef ITCL_VERSION
bu_vls_sprintf(&buffer, "itcl%s", ITCL_VERSION);
p = bu_strdup(bu_vls_cstr(&buffer));
bu_ptbl_ins(&lib_subpaths, (long *)p);
+#endif
#ifdef HAVE_TK
bu_vls_sprintf(&buffer, "tk%s", TK_VERSION);
@@ -158,7 +160,7 @@
p = bu_strdup(bu_vls_cstr(&buffer));
bu_ptbl_ins(&lib_subpaths, (long *)p);
- bu_vls_sprintf(&buffer, "itk%s", ITCL_VERSION);
+ bu_vls_sprintf(&buffer, "itk%s", ITK_VERSION);
p = bu_strdup(bu_vls_cstr(&buffer));
bu_ptbl_ins(&lib_subpaths, (long *)p);
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-12-04 18:43:29 UTC (rev
77930)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-12-04 18:49:21 UTC (rev
77931)
@@ -602,6 +602,7 @@
endif(BRLCAD_ITK_BUILD)
mark_as_advanced(ITK_VERSION)
mark_as_advanced(ITK_LIBRARY)
+CONFIG_H_APPEND(BRLCAD "#cmakedefine ITK_VERSION \"${ITK_VERSION}\"\n")
set(iwidgets_ALIASES ENABLE_IWIDGETS)
set(iwidgets_DESCRIPTION "
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
