Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints

This commit is contained in:
Seth Alves 2016-01-05 11:59:14 -08:00
commit 719c4562d1

View file

@ -5,7 +5,7 @@ include(ExternalProject)
ExternalProject_Add(
${EXTERNAL_NAME}
URL http://zlib.net/zlib128.zip
URL http://hifi-public.s3.amazonaws.com/dependencies/zlib128.zip
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
LOG_DOWNLOAD 1