Revision: 65327
http://sourceforge.net/p/brlcad/code/65327
Author: starseeker
Date: 2015-06-16 16:44:43 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
Commit changes from Byron Bradley to get Tcl's CMake build working with mingw
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/CMakeLists.txt
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2015-06-16 16:41:00 UTC (rev
65326)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2015-06-16 16:44:43 UTC (rev
65327)
@@ -163,6 +163,14 @@
add_definitions(-Dinline=__inline -DBUILD_tcl)
ENDIF(MSVC)
+IF(MINGW)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEP)
+
add_definitions(-DTCL_PIPE_DLL="tclpip${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.dll")
+ add_definitions(-Dinline=__inline -DBUILD_tcl)
+ remove_definitions(-w)
+ add_definitions(-DHAVE_NO_SEH -DEXCEPTION_DISPOSITION=int)
+ENDIF(MINGW)
+
IF(APPLE)
ADD_TCL_CFLAG(MAC_OSX_TCL)
ENDIF(APPLE)
@@ -1028,7 +1036,7 @@
ENDIF(WIN32)
add_library(tcl ${TCL_SRCS})
-target_link_libraries(tcl ${CoreFoundation_LIBRARIES} ${TCL_LINK_LIBS}
${DL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(tcl ${CoreFoundation_LIBRARIES} ${TCL_LINK_LIBS}
${DL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ws2_32)
install(TARGETS tcl
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_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
