Revision: 41332
http://brlcad.svn.sourceforge.net/brlcad/?rev=41332&view=rev
Author: starseeker
Date: 2010-11-12 19:35:12 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Wrap a few things in conditionals for Tk - this should be made more coherent,
but for now it gets things going.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-12 12:18:00 UTC
(rev 41331)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-12 19:35:12 UTC
(rev 41332)
@@ -362,7 +362,6 @@
unix/tkUnixKey.c
unix/tkUnixMenu.c
unix/tkUnixMenubu.c
- unix/tkUnixRFont.c
unix/tkUnixScale.c
unix/tkUnixScrlbr.c
unix/tkUnixSelect.c
@@ -371,6 +370,12 @@
unix/tkUnixXId.c
)
+IF(TK-ENABLE_FREETYPE)
+ SET(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixRFont.c)
+ELSE(TK-ENABLE_FREETYPE)
+ SET(TK_X11_SRCS ${TK_X11_SRCS} unix/tkUnixFont.c)
+ENDIF(TK-ENABLE_FREETYPE)
+
SET(TK_AQUA_SRCS
macosx/tkMacOSXBitmap.c
macosx/tkMacOSXButton.c
@@ -481,11 +486,27 @@
${TCL_INCLUDE_PATH}
${TK_INCLUDE_PATH}
${X11_INCLUDE_DIR}
- ${FREETYPE_INCLUDE_DIRS}
)
+IF(TK-ENABLE_FREETYPE)
+ include_directories(
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ENDIF(TK-ENABLE_FREETYPE)
+
+SET(X11_TK_LIBS ${X11_X11_LIB} ${X11_Xext_LIB} ${X11_Xft_LIB}
${X11_Xrender_LIB})
+
+IF(X11_Xscreensaver_LIB)
+SET(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xscreensaver_LIB})
+ENDIF(X11_Xscreensaver_LIB)
+
+IF(TK-ENABLE_FREETYPE)
+ SET(TK_FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES})
+ SET(TK_FONTCONFIG_LIBRARY ${FONTCONFIG_LIBRARY})
+ENDIF(TK-ENABLE_FREETYPE)
+
add_library(tk ${TK_SRCS})
-target_link_libraries(tk tcl ${COREFOUNDATION_FRAMEWORK} ${X11_X11_LIB}
${X11_Xscreensaver_LIB} ${X11_Xext_LIB} ${X11_Xft_LIB} ${FREETYPE_LIBRARIES}
${FONTCONFIG_LIBRARY} ${X11_Xrender_LIB})
+target_link_libraries(tk tcl ${COREFOUNDATION_FRAMEWORK} ${X11_TK_LIBS}
${TK_FREETYPE_LIBRARIES} ${TK_FONTCONFIG_LIBRARY})
install(TARGETS tk DESTINATION lib)
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_MAJOR_VERSION}.${TK_MINOR_VERSION})
@@ -495,6 +516,6 @@
install(FILES ${TK_HDRS} DESTINATION include)
add_executable(wish ${WISH_SRCS})
-target_link_libraries(wish tcl tk ${COREFOUNDATION_FRAMEWORK} ${X11_X11_LIB}
${X11_Xscreensaver_LIB} ${X11_Xext_LIB} ${X11_Xft_LIB} ${FREETYPE_LIBRARIES}
${FONTCONFIG_LIBRARY} ${X11_Xrender_LIB})
+target_link_libraries(wish tcl tk ${COREFOUNDATION_FRAMEWORK} ${X11_TK_LIBS}
${TK_FREETYPE_LIBRARIES} ${TK_FONTCONFIG_LIBRARY})
install(TARGETS wish DESTINATION bin)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
