Revision: 45794
http://brlcad.svn.sourceforge.net/brlcad/?rev=45794&view=rev
Author: starseeker
Date: 2011-08-05 22:59:26 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Ah HAH! Need to be more selective about when we define USE_TCL_STUBS - wish no
likie.
Modified Paths:
--------------
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2011-08-05 20:39:36 UTC (rev
45793)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2011-08-05 22:59:26 UTC (rev
45794)
@@ -162,7 +162,7 @@
add_definitions(-DSTDC_HEADERS=1)
IF(WIN32)
- add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Ot
-Oi -fp:strict -Gs -GS -GL -MD -DBUILD_tk -BUILD_ttk -DSUPPORT_CONFIG_EMBEDDED
-DHAVE_UXTHEME_H=1 -DUSE_TCL_STUBS)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Ot
-Oi -fp:strict -Gs -GS -GL -MD -DBUILD_tk -BUILD_ttk -DSUPPORT_CONFIG_EMBEDDED
-DHAVE_UXTHEME_H=1)
ENDIF(WIN32)
IF(APPLE)
@@ -586,8 +586,6 @@
SET(LIB_DIR lib)
ENDIF(NOT LIB_DIR)
-add_definitions(-DUSE_TCL_STUBS)
-
IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
@@ -595,6 +593,7 @@
add_library(tkstub STATIC ${TK_STUB_SRCS} ${TTK_STUB_SRCS})
SET_TARGET_PROPERTIES(tkstub PROPERTIES COMPILE_FLAGS "-fPIC")
install(TARGETS tkstub DESTINATION ${LIB_DIR})
+SET_PROPERTY(TARGET tkstub APPEND PROPERTY COMPILE_DEFINITOINS USE_TCL_STUBS)
add_library(tk ${TK_SRCS})
IF(WIN32)
@@ -604,6 +603,7 @@
ENDIF(WIN32)
install(TARGETS tk DESTINATION ${LIB_DIR})
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
+SET_PROPERTY(TARGET tk APPEND PROPERTY COMPILE_DEFINITOINS USE_TCL_STUBS)
GET_TARGET_PROPERTY(TK_LIBLOCATION tk LOCATION_${CMAKE_BUILD_TYPE})
GET_FILENAME_COMPONENT(TK_LIBNAME ${TK_LIBLOCATION} NAME)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
