forked from bartvdbraak/blender
Fix cmake external library build for blosc/freetype on some systems.
This commit is contained in:
parent
a3085190f8
commit
2dbb1e9f0e
@ -25,6 +25,7 @@ set(BLOSC_EXTRA_ARGS
|
|||||||
-DThreads_FOUND=1
|
-DThreads_FOUND=1
|
||||||
-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
|
-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
|
||||||
-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
|
-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
|
||||||
|
-DDEACTIVATE_SNAPPY=ON
|
||||||
)
|
)
|
||||||
|
|
||||||
ExternalProject_Add(external_blosc
|
ExternalProject_Add(external_blosc
|
||||||
|
@ -16,7 +16,15 @@
|
|||||||
#
|
#
|
||||||
# ***** END GPL LICENSE BLOCK *****
|
# ***** 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
|
ExternalProject_Add(external_freetype
|
||||||
URL ${FREETYPE_URI}
|
URL ${FREETYPE_URI}
|
||||||
|
Loading…
Reference in New Issue
Block a user