diff options
Diffstat (limited to 'build_files/build_environment/cmake/blendthumb.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/blendthumb.cmake | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/build_files/build_environment/cmake/blendthumb.cmake b/build_files/build_environment/cmake/blendthumb.cmake index b3064016403..f4cc6ee9d37 100644 --- a/build_files/build_environment/cmake/blendthumb.cmake +++ b/build_files/build_environment/cmake/blendthumb.cmake @@ -17,51 +17,51 @@ # ***** END GPL LICENSE BLOCK ***** if(BUILD_MODE STREQUAL Release) - if(WIN32) - set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb) + if(WIN32) + set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb) - ExternalProject_Add(external_zlib_32 - URL ${ZLIB_URI} - CMAKE_GENERATOR ${GENERATOR_32} - URL_HASH MD5=${ZLIB_HASH} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - PREFIX ${BUILD_DIR}/zlib32 - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS} - INSTALL_DIR ${LIBDIR}/zlib32 - ) + ExternalProject_Add(external_zlib_32 + URL ${ZLIB_URI} + CMAKE_GENERATOR ${GENERATOR_32} + URL_HASH MD5=${ZLIB_HASH} + DOWNLOAD_DIR ${DOWNLOAD_DIR} + PREFIX ${BUILD_DIR}/zlib32 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS} + INSTALL_DIR ${LIBDIR}/zlib32 + ) - ExternalProject_Add(external_zlib_64 - URL ${ZLIB_URI} - CMAKE_GENERATOR ${GENERATOR_64} - URL_HASH MD5=${ZLIB_HASH} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - PREFIX ${BUILD_DIR}/zlib64 - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS} - INSTALL_DIR ${LIBDIR}/zlib64 - ) + ExternalProject_Add(external_zlib_64 + URL ${ZLIB_URI} + CMAKE_GENERATOR ${GENERATOR_64} + URL_HASH MD5=${ZLIB_HASH} + DOWNLOAD_DIR ${DOWNLOAD_DIR} + PREFIX ${BUILD_DIR}/zlib64 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS} + INSTALL_DIR ${LIBDIR}/zlib64 + ) - ExternalProject_Add(external_blendthumb_32 - CMAKE_GENERATOR ${GENERATOR_32} - SOURCE_DIR ${THUMB_DIR} - PREFIX ${BUILD_DIR}/blendthumb32 - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib - INSTALL_DIR ${LIBDIR}/blendthumb32 - ) - add_dependencies( - external_blendthumb_32 - external_zlib_32 - ) + ExternalProject_Add(external_blendthumb_32 + CMAKE_GENERATOR ${GENERATOR_32} + SOURCE_DIR ${THUMB_DIR} + PREFIX ${BUILD_DIR}/blendthumb32 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib + INSTALL_DIR ${LIBDIR}/blendthumb32 + ) + add_dependencies( + external_blendthumb_32 + external_zlib_32 + ) - ExternalProject_Add(external_blendthumb_64 - CMAKE_GENERATOR ${GENERATOR_64} - SOURCE_DIR ${THUMB_DIR} - PREFIX ${BUILD_DIR}/blendthumb64 - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib - INSTALL_DIR ${LIBDIR}/blendthumb64 - ) - add_dependencies( - external_blendthumb_64 - external_zlib_64 - ) - endif() + ExternalProject_Add(external_blendthumb_64 + CMAKE_GENERATOR ${GENERATOR_64} + SOURCE_DIR ${THUMB_DIR} + PREFIX ${BUILD_DIR}/blendthumb64 + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib + INSTALL_DIR ${LIBDIR}/blendthumb64 + ) + add_dependencies( + external_blendthumb_64 + external_zlib_64 + ) + endif() endif() |