Revision: 75579
http://sourceforge.net/p/brlcad/code/75579
Author: starseeker
Date: 2020-04-23 18:15:30 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
The png and zlib prefixing now allows us to permit Tk to build against system
freetype and fontconfig again.
Modified Paths:
--------------
brlcad/trunk/INSTALL
brlcad/trunk/configure
brlcad/trunk/misc/CMake/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/misc/CMake/FindFontconfig.cmake
Modified: brlcad/trunk/INSTALL
===================================================================
--- brlcad/trunk/INSTALL 2020-04-23 18:01:38 UTC (rev 75578)
+++ brlcad/trunk/INSTALL 2020-04-23 18:15:30 UTC (rev 75579)
@@ -544,16 +544,6 @@
Aliases: ENABLE_FREETYPE
---- BRLCAD_Fontconfig ---
-
-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.
-
-Aliases: ENABLE_FONTCONFIG
-
-
--- BRLCAD_NETPBM ---
Option for enabling and disabling compilation of the netpbm library
Modified: brlcad/trunk/configure
===================================================================
--- brlcad/trunk/configure 2020-04-23 18:01:38 UTC (rev 75578)
+++ brlcad/trunk/configure 2020-04-23 18:15:30 UTC (rev 75579)
@@ -130,10 +130,6 @@
shift;;
--disable-freetype) options="$options
-DBRLCAD_FREETYPE=SYSTEM";
shift;;
- --enable-fontconfig) options="$options
-DBRLCAD_Fontconfig=BUNDLED";
- shift;;
- --disable-fontconfig) options="$options
-DBRLCAD_Fontconfig=SYSTEM";
- shift;;
--enable-netpbm) options="$options
-DBRLCAD_NETPBM=BUNDLED";
shift;;
--disable-netpbm) options="$options
-DBRLCAD_NETPBM=SYSTEM";
Modified: brlcad/trunk/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMake/CMakeLists.txt 2020-04-23 18:01:38 UTC (rev
75578)
+++ brlcad/trunk/misc/CMake/CMakeLists.txt 2020-04-23 18:15:30 UTC (rev
75579)
@@ -22,7 +22,6 @@
FindAppleseed.cmake
FindBlosc.cmake
FindBSON.cmake
- FindFontconfig.cmake
FindGDAL.cmake
FindGECODE.cmake
FindGL.cmake
Deleted: brlcad/trunk/misc/CMake/FindFontconfig.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindFontconfig.cmake 2020-04-23 18:01:38 UTC
(rev 75578)
+++ brlcad/trunk/misc/CMake/FindFontconfig.cmake 2020-04-23 18:15:30 UTC
(rev 75579)
@@ -1,93 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindFontconfig
---------------
-
-Find Fontconfig headers and library.
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-``Fontconfig::Fontconfig``
- The Fontconfig library, if found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This will define the following variables in your project:
-
-``Fontconfig_FOUND``
- true if (the requested version of) Fontconfig is available.
-``Fontconfig_VERSION``
- the version of Fontconfig.
-``Fontconfig_LIBRARIES``
- the libraries to link against to use Fontconfig.
-``Fontconfig_INCLUDE_DIRS``
- where to find the Fontconfig headers.
-``Fontconfig_COMPILE_OPTIONS``
- this should be passed to target_compile_options(), if the
- target is not used for linking
-
-#]=======================================================================]
-
-find_path( Fontconfig_INCLUDE_DIR
- NAMES
- fontconfig/fontconfig.h
- HINTS
- ${PKG_FONTCONFIG_INCLUDE_DIRS}
- /usr/X11/include
-)
-
-find_library( Fontconfig_LIBRARY
- NAMES
- fontconfig
- PATHS
- ${PKG_FONTCONFIG_LIBRARY_DIRS}
-)
-
-if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
- file(STRINGS ${Fontconfig_INCLUDE_DIR}/fontconfig/fontconfig.h _contents
REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
- unset(Fontconfig_VERSION)
- foreach(VPART MAJOR MINOR REVISION)
- foreach(VLINE ${_contents})
- if(VLINE MATCHES "^#define[\t ]+FC_${VPART}[\t ]+([0-9]+)$")
- set(Fontconfig_VERSION_PART "${CMAKE_MATCH_1}")
- if(Fontconfig_VERSION)
- string(APPEND Fontconfig_VERSION ".${Fontconfig_VERSION_PART}")
- else()
- set(Fontconfig_VERSION "${Fontconfig_VERSION_PART}")
- endif()
- endif()
- endforeach()
- endforeach()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Fontconfig
- FOUND_VAR
- Fontconfig_FOUND
- REQUIRED_VARS
- Fontconfig_LIBRARY
- Fontconfig_INCLUDE_DIR
- VERSION_VAR
- Fontconfig_VERSION
-)
-
-
-if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
- add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
- set_target_properties(Fontconfig::Fontconfig PROPERTIES
- IMPORTED_LOCATION "${Fontconfig_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${Fontconfig_COMPILE_OPTIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIR}"
- )
-endif()
-
-mark_as_advanced(Fontconfig_LIBRARY Fontconfig_INCLUDE_DIR)
-
-if(Fontconfig_FOUND)
- set(Fontconfig_LIBRARIES ${Fontconfig_LIBRARY})
- set(Fontconfig_INCLUDE_DIRS ${Fontconfig_INCLUDE_DIR})
-endif()
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 18:01:38 UTC (rev
75578)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 18:15:30 UTC (rev
75579)
@@ -306,6 +306,7 @@
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
@@ -340,6 +341,7 @@
# 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 "
@@ -489,10 +491,6 @@
if(BRLCAD_ENABLE_AQUA)
set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
endif(BRLCAD_ENABLE_AQUA)
-if (NOT TEST_FONTCONFIG AND BRLCAD_PNG_BUILD)
- set(TK_DISABLE_XFT 1 CACHE STRING "Disable due to building local libpng"
FORCE)
- mark_as_advanced(TK_DISABLE_XFT)
-endif (NOT TEST_FONTCONFIG AND BRLCAD_PNG_BUILD)
THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
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
