diff options
| author | Campbell Barton <campbell@blender.org> | 2022-01-26 07:30:21 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-01-26 07:31:30 +0300 |
| commit | 4c951bfa829ed123b57c33e7821569f283658fd9 (patch) | |
| tree | 019ff5b1d9d40960b92632832b94c73d42205fc0 | |
| parent | 45304493176e7160917081561bd209ed10527443 (diff) | |
CMake: add WITH_SYSTEM_FREETYPE to link against the systems freetype
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 16 |
2 files changed, 15 insertions, 5 deletions
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) |