Revision: 77428
http://sourceforge.net/p/brlcad/code/77428
Author: starseeker
Date: 2020-10-14 01:19:02 +0000 (Wed, 14 Oct 2020)
Log Message:
-----------
Presumably Tk will be similar to Tcl...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-14
01:16:15 UTC (rev 77427)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-14
01:19:02 UTC (rev 77428)
@@ -40,7 +40,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_WISHNAME wish${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")
@@ -54,11 +54,13 @@
DEPENDS ${TCL_TARGET} rpath_replace
)
+ set(SHARED_DIR ${LIB_DIR})
+
else (NOT MSVC)
- 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})
+ set(TK_BASENAME tk${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TK_STUBNAME tkstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
+ set(TK_WISHNAME wish${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION})
ExternalProject_Add(TK_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tk"
@@ -70,21 +72,21 @@
DEPENDS ${TCL_TARGET}
)
+ set(SHARED_DIR ${BIN_DIR})
+
endif (NOT MSVC)
# Tell the parent build about files and libraries
ExternalProject_Target(tk TK_BLD ${TK_INSTDIR}
- SHARED ${LIB_DIR}/${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ SHARED ${SHARED_DIR}/${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
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}
+ EXEC ${BIN_DIR}/${TK_WISHNAME}${CMAKE_EXECUTABLE_SUFFIX}
RPATH
)
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
