Revision: 77390
http://sourceforge.net/p/brlcad/code/77390
Author: starseeker
Date: 2020-10-09 18:24:04 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Stubs are the Tcl 'static' libs, which we do want.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 17:15:12 UTC (rev 77389)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 18:24:04 UTC (rev 77390)
@@ -178,8 +178,8 @@
# For now, turn everything on:
set(BRLCAD_LEVEL2 ON)
set(BRLCAD_LEVEL3 ON)
-set(BRLCAD_ENABLE_STEP ON)
-set(BRLCAD_ENABLE_GDAL ON)
+#set(BRLCAD_ENABLE_STEP ON)
+#set(BRLCAD_ENABLE_GDAL ON)
set(BRLCAD_ENABLE_TCL ON)
set(BRLCAD_ENABLE_TK ON)
@@ -224,12 +224,16 @@
# GDAL - translator library for raster and vector geospatial data formats
include(${CMAKE_CURRENT_SOURCE_DIR}/gdal.cmake)
-## TCL - scripting language
+# TCL - scripting language. For Tcl/Tk builds we want
+# static lib building on so we get the stub libraries.
+set(BSL_CACHE ${BUILD_STATIC_LIBS})
+set(BUILD_STATIC_LIBS ON)
include(${CMAKE_CURRENT_SOURCE_DIR}/tcl.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/tk.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/itcl.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/itk.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.cmake)
+set(BUILD_STATIC_LIBS ${BSL_CACHE})
# Local Variables:
# tab-width: 8
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
17:15:12 UTC (rev 77389)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
18:24:04 UTC (rev 77390)
@@ -68,7 +68,6 @@
if (NOT MSVC)
set(ITK_BASENAME libitk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
- set(ITK_STUBNAME libitkstub${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
set(ITK_PATCH_FILES "${ITK_SRC_DIR}/configure"
"${ITK_SRC_DIR}/tclconfig/tcl.m4")
@@ -85,7 +84,6 @@
else (NOT MSVC)
set(ITK_BASENAME itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
- set(ITK_STUBNAME itkstub${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
ExternalProject_Add(ITK_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itk3"
@@ -103,7 +101,6 @@
ExternalProject_Target(itk ITK_BLD ${ITK_INSTDIR}
SUBDIR itk${ITK_VERSION}
SHARED
${LIB_DIR}/itk${ITK_VERSION}/${ITK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC
${LIB_DIR}/itk${ITK_VERSION}/${ITK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${INCLUDE_DIR}
${INCLUDE_DIR}
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
