Revision: 41722
http://brlcad.svn.sourceforge.net/brlcad/?rev=41722&view=rev
Author: starseeker
Date: 2010-12-20 18:08:48 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
Not terribly pretty, but get itcl/itk building with VC++ 2010
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-12-20 16:54:37 UTC
(rev 41721)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-12-20 18:08:48 UTC
(rev 41722)
@@ -100,6 +100,7 @@
IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
ADD_SUBDIRECTORY(tcl)
SET(TCL_LIBRARY tcl CACHE STRING "TCL_LIBRARY" FORCE)
+ SET(TCL_STUB_LIBRARY tclstub CACHE STRING "TCL_LIBRARY" FORCE)
get_directory_property(TCL_INCLUDE_PATH DIRECTORY tcl DEFINITION
TCL_INCLUDE_PATH)
SET(TCL_INCLUDE_PATH "${TCL_INCLUDE_PATH}" CACHE STRING "Tcl include
paths" FORCE)
SET(TCL_TCLSH tclsh CACHE STRING "Tcl shell" FORCE)
Modified: brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2010-12-20
16:54:37 UTC (rev 41721)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2010-12-20
18:08:48 UTC (rev 41722)
@@ -108,12 +108,23 @@
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_NAME=\\\"itcl\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_TARNAME=\\\"itcl\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS}
-DPACKAGE_VERSION=\\\"${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
+IF(NOT WIN32)
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_STRING=\\\"itcl\\\
${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
+ELSE(NOT WIN32)
+SET(ITCL_CFLAGS "${ITCL_CFLAGS}
-DPACKAGE_STRING=\\\"itcl_${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
+ENDIF(NOT WIN32)
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DSTDC_HEADERS=1")
#----------------------------------------------------------------------------
+# Windows specific flags
+IF(WIN32)
+ SET(ITCL_CFLAGS "${ITCL_CFLAGS} -c -W3 -D _CRT_SECURE_NO_DEPRECATE -D
_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -MD")
+ SET(ITCL_CFLAGS "${ITCL_CFLAGS} -Dinline=__inline -DBUILD_itcl")
+ENDIF(WIN32)
+
+
SET(TCL_CFLAGS "")
SC_MISSING_POSIX_HEADERS()
@@ -463,7 +474,7 @@
)
add_library(itcl ${ITCL_GENERIC_SRCS})
-target_link_libraries(itcl ${M_LIBRARY} ${TCL_LIBRARY})
+target_link_libraries(itcl ${M_LIBRARY} ${TCL_LIBRARY} ${TCL_STUB_LIBRARY})
install(TARGETS itcl DESTINATION
lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
set_target_properties(itcl PROPERTIES INSTALL_RPATH
${CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
set_target_properties(itcl PROPERTIES INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-12-20
16:54:37 UTC (rev 41721)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-12-20
18:08:48 UTC (rev 41722)
@@ -108,12 +108,21 @@
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_NAME=\\\"itk\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_TARNAME=\\\"itk\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS}
-DPACKAGE_VERSION=\\\"${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
+IF(NOT WIN32)
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_STRING=\\\"itk\\\
${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
+ELSE(NOT WIN32)
+SET(ITK_CFLAGS "${ITK_CFLAGS}
-DPACKAGE_STRING=\\\"itk_${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
+ENDIF(NOT WIN32)
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS} -DSTDC_HEADERS=1")
#----------------------------------------------------------------------------
+IF(WIN32)
+ SET(ITK_CFLAGS "${ITK_CFLAGS} -c -W3 -D _CRT_SECURE_NO_DEPRECATE -D
_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -MD")
+ SET(ITK_CFLAGS "${ITK_CFLAGS} -Dinline=__inline -DBUILD_itk")
+ENDIF(WIN32)
+
SET(TCL_CFLAGS "")
SC_MISSING_POSIX_HEADERS()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
