Revision: 77422
http://sourceforge.net/p/brlcad/code/77422
Author: starseeker
Date: 2020-10-14 00:54:45 +0000 (Wed, 14 Oct 2020)
Log Message:
-----------
Start figuring out the particular incantations we'll need for Tcl building on
Windows...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-14
00:21:48 UTC (rev 77421)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-14
00:54:45 UTC (rev 77422)
@@ -58,6 +58,8 @@
INSTALL_COMMAND make install
DEPENDS ${ZLIB_TARGET} tcl_replace rpath_replace
)
+ set(TCL_APPINIT unix/tclAppInit.c)
+
else (NOT MSVC)
set(TCL_BASENAME tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
@@ -68,13 +70,15 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CONFIGURE_COMMAND ""
BINARY_DIR ${TCL_SRC_DIR}/win
- BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TCL_INSTDIR}
- INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${TCL_INSTDIR}
+ BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TCL_INSTDIR} SUFX=
+ INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${TCL_INSTDIR} SUFX=
)
+ set(TCL_APPINIT)
endif (NOT MSVC)
# Tell the parent build about files and libraries
+ # TODO - LIB_DIR is wrong with MSVC...
ExternalProject_Target(tcl TCL_BLD ${TCL_INSTDIR}
SHARED ${LIB_DIR}/${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
@@ -310,7 +314,7 @@
package.tcl
parray.tcl
safe.tcl
- tclAppInit.c
+ ${TCL_APPINIT}
tclIndex
tm.tcl
word.tcl
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
