Revision: 75263
http://sourceforge.net/p/brlcad/code/75263
Author: starseeker
Date: 2020-04-03 23:49:25 +0000 (Fri, 03 Apr 2020)
Log Message:
-----------
Note - it will be important to have freetype and fontconfig come before the X11
libraries in the link lines, otherwise the system versions get picked up...
Modified Paths:
--------------
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-03 16:21:36 UTC (rev
75262)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-03 23:49:25 UTC (rev
75263)
@@ -265,15 +265,15 @@
IF(NOT FREETYPE_FOUND)
SET(FREETYPE_LIBRARIES "")
ENDIF(NOT FREETYPE_FOUND)
- IF(NOT FONTCONFIG_FOUND)
- SET(FONTCONFIG_LIBRARIES "")
- ENDIF(NOT FONTCONFIG_FOUND)
+ IF(NOT Fontconfig_FOUND)
+ SET(Fontconfig_LIBRARIES "")
+ ENDIF(NOT Fontconfig_FOUND)
ENDIF(NOT WIN32)
- CMAKE_DEPENDENT_OPTION(TK_ENABLE_XFT "Use freetype/fontconfig/xft" ON
"TK_SYSTEM_GRAPHICS STREQUAL x11;FREETYPE_FOUND;FONTCONFIG_FOUND;X11_Xft_FOUND"
OFF)
+ CMAKE_DEPENDENT_OPTION(TK_ENABLE_XFT "Use freetype/fontconfig/xft" ON
"TK_SYSTEM_GRAPHICS STREQUAL x11;FREETYPE_FOUND;Fontconfig_FOUND;X11_Xft_FOUND"
OFF)
else(NOT TK_DISABLE_XFT)
set(TK_ENABLE_XFT OFF)
set(FREETYPE_LIBRARIES "")
- set(FONTCONFIG_LIBRARIES "")
+ set(Fontconfig_LIBRARIES "")
endif(NOT TK_DISABLE_XFT)
#----------------------------------------------------------------------------
@@ -728,9 +728,9 @@
target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB}
${X11_TK_LIBS} ${TK_MINGW_LIBS})
ELSE(WIN32)
target_link_libraries(tk tkstub ${TCL_STUB_LIBRARY} ${TCL_THREADS_LIB}
- ${X11_TK_LIBS} ${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK}
+ ${CoreFoundation_LIBRARIES} ${CARBON_FRAMEWORK}
${COCOA_FRAMEWORK} ${IOKit_LIBRARIES} ${FREETYPE_LIBRARIES}
- ${PNG_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${M_LIBRARY})
+ ${PNG_LIBRARIES} ${Fontconfig_LIBRARIES} ${X11_TK_LIBS} ${M_LIBRARY})
ENDIF(WIN32)
install(TARGETS tk
RUNTIME DESTINATION ${BIN_DIR}
@@ -771,7 +771,7 @@
add_executable(wish ${WISH_SRCS})
target_link_libraries(wish ${TCL_LIBRARY} ${TCL_STUB_LIBRARY} tk
${CoreFoundation_LIBRARIES}
${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKit_LIBRARIES}
- ${TCL_THREADS_LIB} ${M_LIBRARY} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES}
${FONTCONFIG_LIBRARIES})
+ ${TCL_THREADS_LIB} ${M_LIBRARY} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES}
${Fontconfig_LIBRARIES})
IF(TK_ENABLE_AQUA)
SET_PROPERTY(TARGET wish APPEND PROPERTY COMPILE_FLAGS "-std=gnu99 -x
objective-c -fobjc-gc")
ENDIF(TK_ENABLE_AQUA)
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
