Revision: 77397
http://sourceforge.net/p/brlcad/code/77397
Author: starseeker
Date: 2020-10-09 20:39:24 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Start working on FindTCL
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-09
19:57:08 UTC (rev 77396)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-09
20:39:24 UTC (rev 77397)
@@ -72,11 +72,14 @@
# Tell the parent build about files and libraries
ExternalProject_Target(tcl TCL_BLD ${TCL_INSTDIR}
SHARED ${LIB_DIR}/${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC ${LIB_DIR}/${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(tclsh TCL_BLD ${TCL_INSTDIR}
+ ExternalProject_Target(tclstub TCL_BLD ${TCL_INSTDIR}
+ STATIC ${LIB_DIR}/${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+
+ ExternalProject_Target(tclsh_exe TCL_BLD ${TCL_INSTDIR}
EXEC
${BIN_DIR}/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${CMAKE_EXECUTABLE_SUFFIX}
RPATH
)
@@ -317,7 +320,12 @@
tclTomMath.h
)
+
+ set(TCL_LIBRARY tcl CACHE STRING "Building bundled tcl" FORCE)
set(TCL_LIBRARIES tcl CACHE STRING "Building bundled tcl" FORCE)
+ set(TCL_STUB_LIBRARY tclstub CACHE STRING "Building bundled tcl" FORCE)
+ set(TCL_TCLSH tclsh_exe CACHE STRING "Building bundled tcl" FORCE)
+ set(TCL_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
SetTargetFolder(TCL_BLD "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-09
19:57:08 UTC (rev 77396)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-09
20:39:24 UTC (rev 77397)
@@ -33,6 +33,7 @@
set(TK_BASENAME libtk${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
set(TK_STUBNAME libtkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TTK_STUBNAME libttkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
set(TK_PATCH_FILES "${TK_SRC_DIR}/unix/configure"
"${TK_SRC_DIR}/macosx/configure" "${TK_SRC_DIR}/unix/tcl.m4")
@@ -48,8 +49,9 @@
else (NOT MSVC)
- set(TCL_BASENAME tk${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
- set(TCL_STUBNAME tkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TK_BASENAME tk${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TK_STUBNAME tkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
+ set(TTK_STUBNAME ttkstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
ExternalProject_Add(TK_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tk"
@@ -66,10 +68,15 @@
# Tell the parent build about files and libraries
ExternalProject_Target(tk TK_BLD ${TK_INSTDIR}
SHARED ${LIB_DIR}/${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC ${LIB_DIR}/${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(wish TK_BLD ${TK_INSTDIR}
+ ExternalProject_Target(tkstub TK_BLD ${TK_INSTDIR}
+ STATIC ${LIB_DIR}/${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ ExternalProject_Target(ttkstub TK_BLD ${TK_INSTDIR}
+ STATIC ${LIB_DIR}/${TTK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ ExternalProject_Target(wish_exe TK_BLD ${TK_INSTDIR}
EXEC
${BIN_DIR}/wish${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${CMAKE_EXECUTABLE_SUFFIX}
RPATH
)
@@ -184,7 +191,12 @@
tkPlatDecls.h
)
+ set(TK_LIBRARY tk CACHE STRING "Building bundled tk" FORCE)
set(TK_LIBRARIES tk CACHE STRING "Building bundled tk" FORCE)
+ set(TK_STUB_LIBRARY tkstub CACHE STRING "Building bundled tk" FORCE)
+ set(TTK_STUB_LIBRARY ttkstub CACHE STRING "Building bundled tk" FORCE)
+ set(TK_WISH wish_exe CACHE STRING "Building bundled tk" FORCE)
+ set(TK_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
set(TK_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
SetTargetFolder(TK_BLD "Third Party Libraries")
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
