[Bf-blender-cvs] [4c951bfa829] master: CMake: add WITH_SYSTEM_FREETYPE to link against the systems freetype

[Campbell Barton]

Commit: 4c951bfa829ed123b57c33e7821569f283658fd9
Author: Campbell Barton
Date:   Wed Jan 26 15:30:21 2022 +1100
Branches: master
https://developer.blender.org/rB4c951bfa829ed123b57c33e7821569f283658fd9

CMake: add WITH_SYSTEM_FREETYPE to link against the systems freetype

===================================================================

M	CMakeLists.txt
M	build_files/cmake/platform/platform_unix.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25cdd122a7f..0a73a2fae1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,11 +273,13 @@ endif()
 
 if(UNIX AND NOT APPLE)
   option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
-  option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system"           ON)
+  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
+  option(WITH_SYSTEM_FREETYPE "Use the freetype library provided by the operating system" OFF)
 else()
   # not an option for other OS's
   set(WITH_SYSTEM_GLEW OFF)
   set(WITH_SYSTEM_GLES OFF)
+  set(WITH_SYSTEM_FREETYPE OFF)
 endif()
 
 
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index a3b8b17ec19..c5a9017f025 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -104,10 +104,12 @@ find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
 
-# FreeType compiled with Brotli compression for woff2.
-find_package_wrapper(Freetype REQUIRED)
-if(EXISTS ${LIBDIR})
-  find_package_wrapper(Brotli REQUIRED)
+if(NOT WITH_SYSTEM_FREETYPE)
+  # FreeType compiled with Brotli compression for woff2.
+  find_package_wrapper(Freetype REQUIRED)
+  if(EXISTS ${LIBDIR})
+    find_package_wrapper(Brotli REQUIRED)
+  endif()
 endif()
 
 if(WITH_PYTHON)
@@ -552,6 +554,12 @@ if(EXISTS ${LIBDIR})
   set(WITH_STATIC_LIBS ${WITH_STATIC_LIBS_INIT})
 endif()
 
+if(WITH_SYSTEM_FREETYPE)
+  find_package_wrapper(Freetype)
+  if(NOT FREETYPE_FOUND)
+    message(FATAL_ERROR "Failed finding system FreeType version!")
+  endif()
+endif()
 
 if(WITH_LZO AND WITH_SYSTEM_LZO)
   find_package_wrapper(LZO)