Revision: 68888
          http://sourceforge.net/p/brlcad/code/68888
Author:   starseeker
Date:     2016-09-22 15:37:15 +0000 (Thu, 22 Sep 2016)
Log Message:
-----------
For the moment, disable the src/other freetype build.  We either need to bring 
in our own version of fontconfig to avoid conflicts with system libs, or figure 
out how to customize our version of freetype to not use fontconfig.

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

Modified: brlcad/trunk/INSTALL
===================================================================
--- brlcad/trunk/INSTALL        2016-09-22 01:41:29 UTC (rev 68887)
+++ brlcad/trunk/INSTALL        2016-09-22 15:37:15 UTC (rev 68888)
@@ -546,16 +546,6 @@
 Aliases:  ENABLE_TINYCTHREAD
 
 
---- BRLCAD_FREETYPE ---
-
-Option for enabling and disabling compilation of the FreeType
-libraries 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_FREETYPE
-
-
 --- BRLCAD_TERMLIB ---
 
 Option for enabling and disabling compilation of the termlib library

Modified: brlcad/trunk/configure
===================================================================
--- brlcad/trunk/configure      2016-09-22 01:41:29 UTC (rev 68887)
+++ brlcad/trunk/configure      2016-09-22 15:37:15 UTC (rev 68888)
@@ -130,10 +130,6 @@
                                   shift;;
      --disable-tinycthread)                options="$options 
-DBRLCAD_TINYCTHREAD=SYSTEM";
                                   shift;;
-     --enable-freetype)                options="$options 
-DBRLCAD_FREETYPE=BUNDLED";
-                                  shift;;
-     --disable-freetype)                options="$options 
-DBRLCAD_FREETYPE=SYSTEM";
-                                  shift;;
      --enable-termlib)                options="$options 
-DBRLCAD_TERMLIB=BUNDLED";
                                   shift;;
      --disable-termlib)                options="$options 
-DBRLCAD_TERMLIB=SYSTEM";

Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt       2016-09-22 01:41:29 UTC (rev 
68887)
+++ brlcad/trunk/src/other/CMakeLists.txt       2016-09-22 15:37:15 UTC (rev 
68888)
@@ -123,42 +123,45 @@
 SetTargetFolder(tinycthread-static "Third Party Libraries")
 
 # FreeType Libraries
-set(FREETYPE_NO_DIST 1)
-set(freetype_ALIASES ENABLE_FREETYPE)
-set(freetype_DESCRIPTION "
-Option for enabling and disabling compilation of the FreeType
-libraries 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(freetype FREETYPE ft freetype_DESCRIPTION BRLCAD_LEVEL3 ALIASES 
${freetype_ALIASES} FIND_NAME Freetype)
-if(BRLCAD_FREETYPE_BUILD)
-  set(FREETYPE_LIBRARY freetype CACHE STRING "libfreetype" FORCE)
-  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)
-  set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}" CACHE STRING "FreeType 
Libraries")
-  SetTargetFolder(freetype "Third Party Libraries")
-endif(BRLCAD_FREETYPE_BUILD)
-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")
-endif(NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftconfig.h-new")
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftoption.h-new")
-mark_as_advanced(FREETYPE_INCLUDE_DIRS)
-mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
-mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
-mark_as_advanced(FREETYPE_LIBRARIES)
 
+#set(freetype_ALIASES ENABLE_FREETYPE)
+#set(freetype_DESCRIPTION "
+#Option for enabling and disabling compilation of the FreeType
+#libraries 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.
+#")
+## We don't want the Freetype distribution build targets
+#set(FREETYPE_NO_DIST 1)
+#THIRD_PARTY(freetype FREETYPE ft freetype_DESCRIPTION BRLCAD_LEVEL3 ALIASES 
${freetype_ALIASES} FIND_NAME Freetype)
+#if(BRLCAD_FREETYPE_BUILD)
+#  set(FREETYPE_LIBRARY freetype CACHE STRING "libfreetype" FORCE)
+#  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)
+#  set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}" CACHE STRING "FreeType 
Libraries")
+#  SetTargetFolder(freetype "Third Party Libraries")
+#endif(BRLCAD_FREETYPE_BUILD)
+#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")
+#endif(NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL 
"${CMAKE_CURRENT_SOURCE_DIR}")
+#DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftconfig.h-new")
+#DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/freetype/include/freetype/config/ftoption.h-new")
+#mark_as_advanced(FREETYPE_INCLUDE_DIRS)
+#mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
+#mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
+#mark_as_advanced(FREETYPE_LIBRARIES)
+CMAKEFILES(freetype)
+
 # --------------------------------------------------------------------
 # The incrtTcl subdirectory isn't directly referenced, but its
 # subdirectories are used - mark incrTcl as ignored

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


------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to