diff --git a/3rdparty/ext_lzma/CMakeLists.txt b/3rdparty/ext_lzma/CMakeLists.txt index de7779a8fd..b33d2b1c11 100644 --- a/3rdparty/ext_lzma/CMakeLists.txt +++ b/3rdparty/ext_lzma/CMakeLists.txt @@ -1,56 +1,56 @@ SET(PREFIX_ext_lzma "${EXTPREFIX}" ) if (MINGW) if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # 64 bits ExternalProject_Add( ext_lzma DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL https://tukaani.org/xz/xz-5.2.4-windows.zip URL_MD5 3a4467e74e1eafb89b517aae7044e46c INSTALL_DIR ${PREFIX_ext_lzma} CONFIGURE_COMMAND "" BUILD_COMMAND ${CMAKE_COMMAND} -E echo Deploying 64-bit liblzma.dll INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /bin_x86-64/liblzma.dll ${PREFIX_ext_lzma}/bin/ COMMAND ${CMAKE_COMMAND} -E copy /bin_x86-64/liblzma.a ${PREFIX_ext_lzma}/bin/ - #COMMAND ${CMAKE_COMMAND} -E copy /include/lzma.h ${PREFIX_ext_lzma}/include - #COMMAND ${CMAKE_COMMAND} -E copy_directory /include/lzma ${PREFIX_ext_lzma}/include/lzma + COMMAND ${CMAKE_COMMAND} -E copy /include/lzma.h ${PREFIX_ext_lzma}/include + COMMAND ${CMAKE_COMMAND} -E copy_directory /include/lzma ${PREFIX_ext_lzma}/include/lzma UPDATE_COMMAND "" ) else() # 32 bits ExternalProject_Add( ext_lzma DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL https://tukaani.org/xz/xz-5.2.4-windows.zip URL_MD5 3a4467e74e1eafb89b517aae7044e46c INSTALL_DIR ${PREFIX_ext_lzma} CONFIGURE_COMMAND "" BUILD_COMMAND ${CMAKE_COMMAND} -E echo Deploying 32-bit liblzma.dll INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /bin_i686-sse2/liblzma.dll ${PREFIX_ext_lzma}/bin/ COMMAND ${CMAKE_COMMAND} -E copy /bin_i686-sse2/liblzma.a ${PREFIX_ext_lzma}/bin/ - #COMMAND ${CMAKE_COMMAND} -E copy /include/lzma.h ${PREFIX_ext_lzma}/include - #COMMAND ${CMAKE_COMMAND} -E copy_directory /include/lzma ${PREFIX_ext_lzma}/include/lzma + COMMAND ${CMAKE_COMMAND} -E copy /include/lzma.h ${PREFIX_ext_lzma}/include + COMMAND ${CMAKE_COMMAND} -E copy_directory /include/lzma ${PREFIX_ext_lzma}/include/lzma UPDATE_COMMAND "" ) endif() else () ExternalProject_Add( ext_lzma DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL http://tukaani.org/xz/xz-5.2.3.tar.xz URL_MD5 60fb79cab777e3f71ca43d298adacbd5 INSTALL_DIR ${PREFIX_ext_lzma} CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_lzma} --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc --disable-static --enable-shared ${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make INSTALL_COMMAND make install UPDATE_COMMAND "" BUILD_IN_SOURCE 1 ) endif () diff --git a/3rdparty/ext_tiff/CMakeLists.txt b/3rdparty/ext_tiff/CMakeLists.txt index f4e3db88d1..65c5f97870 100644 --- a/3rdparty/ext_tiff/CMakeLists.txt +++ b/3rdparty/ext_tiff/CMakeLists.txt @@ -1,11 +1,11 @@ SET(EXTPREFIX_tiff "${EXTPREFIX}" ) ExternalProject_Add( ext_tiff DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL http://files.kde.org/krita/build/dependencies/tiff-4.0.9.tar.gz URL_MD5 54bad211279cc93eb4fca31ba9bfdc79 INSTALL_DIR ${EXTPREFIX_tiff} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -Dlzma=OFF + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} UPDATE_COMMAND "" )