[brlcad-commits] SF.net SVN: brlcad:[63465] brlcad/trunk/src/other/tk/CMakeLists.txt

[<sta...@us...>]

Revision: 63465
          http://sourceforge.net/p/brlcad/code/63465
Author:   starseeker
Date:     2014-11-17 15:48:51 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Some indications that freetype may need png, so go ahead and add it to tk's link list.

Modified Paths:
--------------
    brlcad/trunk/src/other/tk/CMakeLists.txt

Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt	2014-11-17 15:41:30 UTC (rev 63464)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt	2014-11-17 15:48:51 UTC (rev 63465)
@@ -773,7 +773,10 @@
 IF(WIN32)
   target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB} ${X11_TK_LIBS})
 ELSE(WIN32)
-  target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB} ${X11_TK_LIBS} ${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${M_LIBRARY})
+  target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB}
+	  ${X11_TK_LIBS} ${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK}
+	  ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES} ${FREETYPE_LIBRARIES}
+	  ${PNG_LIBRARY} ${FONTCONFIG_LIBRARIES} ${M_LIBRARY})
 ENDIF(WIN32)
 install(TARGETS tk
 	RUNTIME DESTINATION ${BIN_DIR}
@@ -794,7 +797,9 @@
   target_link_libraries(wish tcl tk imm32.lib comctl32.lib)
 ELSE(WIN32)
   add_executable(wish ${WISH_SRCS})
-  target_link_libraries(wish ${TCL_LIBRARY} tk ${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES} ${TCL_THREADS_LIB} ${M_LIBRARY} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+  target_link_libraries(wish ${TCL_LIBRARY} tk ${CoreFoundation_LIBRARIES}
+	  ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES}
+	  ${TCL_THREADS_LIB} ${M_LIBRARY} ${FREETYPE_LIBRARIES} ${PNG_LIBRARY} ${FONTCONFIG_LIBRARIES})
   IF(TK_ENABLE_AQUA)
     SET_PROPERTY(TARGET wish APPEND PROPERTY COMPILE_FLAGS "-std=gnu99 -x objective-c")
   ENDIF(TK_ENABLE_AQUA)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.