Revision: 75580
http://sourceforge.net/p/brlcad/code/75580
Author: starseeker
Date: 2020-04-23 18:41:41 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
fontconfig probably won't be worth the trouble - VCS has it if need be.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/src/other/fontconfig/
brlcad/trunk/src/other/fontconfig.dist
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 18:15:30 UTC (rev
75579)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 18:41:41 UTC (rev
75580)
@@ -279,26 +279,23 @@
THIRD_PARTY(freetype FREETYPE ft freetype_DESCRIPTION BRLCAD_LEVEL3 ALIASES
ENABLE_FREETYPE REQUIRED_VARS "TEST_FONTCONFIG;BRLCAD_LEVEL3" FIND_NAME
Freetype)
if(BRLCAD_FREETYPE_BUILD)
set(FREETYPE_LIBRARY freetype CACHE STRING "libfreetype" FORCE)
- mark_as_advanced(FREETYPE_LIBRARY)
set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}" CACHE STRING "FreeType
Libraries")
- mark_as_advanced(FREETYPE_LIBRARIES)
- set(FREETYPE_INCLUDE_DIR_freetype2
- "${BRLCAD_SOURCE_DIR}/src/other/freetype/include"
- CACHE STRING "FreeType freetype2 include dir" FORCE
- )
- mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
- set(FREETYPE_INCLUDE_DIR_ft2build
- "${CMAKE_CURRENT_BINARY_DIR}/freetype/include"
- CACHE STRING "FreeType ft2build include dir" FORCE
- )
- mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
- set(FREETYPE_INCLUDE_DIRS
- "${FREETYPE_INCLUDE_DIR_freetype2};${FREETYPE_INCLUDE_DIR_ft2build}"
+ set(FREETYPE_INCLUDE_DIR_freetype2
"${BRLCAD_SOURCE_DIR}/src/other/freetype/include"
+ CACHE STRING "FreeType freetype2 include dir" FORCE)
+ set(FREETYPE_INCLUDE_DIR_ft2build
"${CMAKE_CURRENT_BINARY_DIR}/freetype/include"
+ CACHE STRING "FreeType ft2build include dir" FORCE)
+ set(FREETYPE_INCLUDE_DIRS
"${FREETYPE_INCLUDE_DIR_freetype2};${FREETYPE_INCLUDE_DIR_ft2build}"
CACHE STRING "Directories containing FreeType headers." FORCE)
- mark_as_advanced(FREETYPE_INCLUDE_DIRS)
set(FREETYPE_VERSION_STRING "2.6.5" CACHE STRING "Freetype version" FORCE)
+ set(FREETYPE_FOUND TRUE CACHE BOOL "Freetype" FORCE)
+
SetTargetFolder(freetype "Third Party Libraries")
endif(BRLCAD_FREETYPE_BUILD)
+mark_as_advanced(FREETYPE_INCLUDE_DIRS)
+mark_as_advanced(FREETYPE_LIBRARY)
+mark_as_advanced(FREETYPE_LIBRARIES)
+mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
+mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
if(NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftconfig.h")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftoption.h")
@@ -306,43 +303,6 @@
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftconfig.h-new")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftoption.h-new")
-if(0)
-# Fontconfig library - must come after PNG and FREETYPE
-set(fontconfig_DESCRIPTION "
-Option for enabling and disabling compilation of the Fontconfig
-library provided with BRL-CAD's source code. Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-")
-THIRD_PARTY(fontconfig Fontconfig ft fontconfig_DESCRIPTION BRLCAD_LEVEL3
ALIASES ENABLE_FONTCONFIG REQUIRED_VARS "TEST_FONTCONFIG;BRLCAD_LEVEL3"
FIND_NAME Fontconfig)
-if(BRLCAD_Fontconfig_BUILD)
- set(Fontconfig_LIBRARY fontconfig CACHE STRING "fontconfig" FORCE)
- mark_as_advanced(Fontconfig_LIBRARY)
- set(Fontconfig_LIBRARIES "${Fontconfig_LIBRARY}" CACHE STRING "FreeType
Libraries")
- mark_as_advanced(Fontconfig_LIBRARIES)
- set(Fontconfig_INCLUDE_DIR
-
"${BRLCAD_BINARY_DIR}/src/other/fontconfig/include;${BRLCAD_SOURCE_DIR}/src/other/fontconfig/include"
- CACHE STRING "fontconfig include dir" FORCE)
- mark_as_advanced(Fontconfig_INCLUDE_DIR)
- set(Fontconfig_INCLUDE_DIRS "${Fontconfig_INCLUDE_DIR}" CACHE STRING
"Fontconfig headers." FORCE)
- mark_as_advanced(Fontconfig_INCLUDE_DIRS)
- set(Fontconfig_VERSION "2.13.92" CACHE STRING "Fontconfig version" FORCE)
- set(Fontconfig_COMPILE_OPTIONS "" CACHE STRING "Fontconfig compile options"
FORCE)
- set(pkgcfg_lib_PKG_FONTCONFIG_fontconfig fontconfig)
- set(pkgcfg_lib_PKG_FONTCONFIG_freetype ${FREETYPE_LIBRARIES})
- SetTargetFolder(fontconfig "Third Party Libraries")
-
- # TODO - in order for this to work, we may need to change how the built copy
- # of Tk uses fontconfig. We want to look for our own (guaranteed) fonts
- # rather than the system fonts for consistency, but that means building our
- # own share/fontconfig directory with a config file and cache. Tk then needs
- # to call fontconfig to look there rather than the system version. There are
- # some test programs in the tests directory of the main fontconfig
- # distribution which may offer some hints on what is needed for this...
-
-endif(BRLCAD_Fontconfig_BUILD)
-endif(0)
-
# libnetpbm Library support for pnm,ppm,pbm, etc. image files
set(netpbm_DESCRIPTION "
Option for enabling and disabling compilation of the netpbm library
Deleted: brlcad/trunk/src/other/fontconfig.dist
===================================================================
--- brlcad/trunk/src/other/fontconfig.dist 2020-04-23 18:15:30 UTC (rev
75579)
+++ brlcad/trunk/src/other/fontconfig.dist 2020-04-23 18:41:41 UTC (rev
75580)
@@ -1,81 +0,0 @@
-set(fontconfig_ignore_files
-CMakeLists.txt
-COPYING
-COPYING.expat
-README
-README.cmake
-expat/ConfigureChecks.cmake
-expat/README.md
-expat/ascii.h
-expat/asciitab.h
-expat/expat.h
-expat/expat_config.h.cmake
-expat/expat_external.h
-expat/iasciitab.h
-expat/internal.h
-expat/latin1tab.h
-expat/nametab.h
-expat/siphash.h
-expat/utf8tab.h
-expat/winconfig.h
-expat/xmlparse.c
-expat/xmlrole.c
-expat/xmlrole.h
-expat/xmltok.c
-expat/xmltok.h
-expat/xmltok_impl.c
-expat/xmltok_impl.h
-expat/xmltok_ns.c
-include/config.h.in
-include/fc-case/fccase.h
-include/fc-lang/fclang.h
-include/fcalias.h
-include/fcaliastail.h
-include/fcarch.h
-include/fcatomic.h
-include/fcdeprecate.h
-include/fcftalias.h
-include/fcftaliastail.h
-include/fcftint.h
-include/fcint.h
-include/fcmutex.h
-include/fcobjs.h
-include/fcobjshash.gperf.h
-include/fcobjshash.h
-include/fcstdint.h
-include/fcwindows.h
-include/fontconfig/fcfreetype.h
-include/fontconfig/fcprivate.h
-include/fontconfig/fontconfig.h
-include/ftglue.h
-src/CMakeLists.txt
-src/fcarch.c
-src/fcatomic.c
-src/fccache.c
-src/fccfg.c
-src/fccharset.c
-src/fccompat.c
-src/fcdbg.c
-src/fcdefault.c
-src/fcdir.c
-src/fcformat.c
-src/fcfreetype.c
-src/fcfs.c
-src/fchash.c
-src/fcinit.c
-src/fclang.c
-src/fclist.c
-src/fcmatch.c
-src/fcmatrix.c
-src/fcname.c
-src/fcobjs.c
-src/fcpat.c
-src/fcptrlist.c
-src/fcrange.c
-src/fcserialize.c
-src/fcstat.c
-src/fcstr.c
-src/fcweight.c
-src/fcxml.c
-src/ftglue.c
-)
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
