[Bf-blender-cvs] [2dbb1e9f0ee] master: Fix cmake external library build for blosc/freetype on some systems.

[Brecht Van Lommel]

Commit: 2dbb1e9f0eec75e1fa11a573a151690c91a976dd
Author: Brecht Van Lommel
Date:   Tue Jul 31 14:22:32 2018 +0200
Branches: master
https://developer.blender.org/rB2dbb1e9f0eec75e1fa11a573a151690c91a976dd

Fix cmake external library build for blosc/freetype on some systems.

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

M	build_files/build_environment/cmake/blosc.cmake
M	build_files/build_environment/cmake/freetype.cmake

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

diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake
index 606fe8c61cc..9a5ef745985 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -25,6 +25,7 @@ set(BLOSC_EXTRA_ARGS
 	-DThreads_FOUND=1
 	-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
 	-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
+	-DDEACTIVATE_SNAPPY=ON
 )
 
 ExternalProject_Add(external_blosc
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake
index 751b2b1f383..9afc902531b 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -16,7 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d -DWITH_BZip2=OFF -DWITH_HarfBuzz=OFF)
+set(FREETYPE_EXTRA_ARGS
+	-DCMAKE_RELEASE_POSTFIX:STRING=2ST
+	-DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
+	-DWITH_BZip2=OFF
+	-DWITH_HarfBuzz=OFF
+	-DFT_WITH_HARFBUZZ=OFF
+	-DFT_WITH_BZIP2=OFF
+	-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
+	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
 
 ExternalProject_Add(external_freetype
 	URL ${FREETYPE_URI}