Commit: 2bdc9908a9a193a0102825a15c2e32ff4d25d14d Author: Campbell Barton Date: Tue Sep 27 08:48:28 2022 +1000 Branches: blender-v3.3-release https://developer.blender.org/rB2bdc9908a9a193a0102825a15c2e32ff4d25d14d
Cleanup: correct indentation of harvest.cmake =================================================================== M build_files/build_environment/cmake/harvest.cmake =================================================================== diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index bc456858d2a..15316f3f353 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -11,189 +11,191 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}") if(WIN32) -if(BUILD_MODE STREQUAL Release) - add_custom_target(Harvest_Release_Results - COMMAND # jpeg rename libfile + copy include - ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ && - # png - ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ && - # freeglut-> opengl - ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ && - # glew-> opengl - ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ && - DEPENDS - ) -endif() + if(BUILD_MODE STREQUAL Release) + add_custom_target(Harvest_Release_Results + COMMAND # jpeg rename libfile + copy include + ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib && + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ && + # png + ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib && + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ && + # freeglut-> opengl + ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib && + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ && + # glew-> opengl + ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib && + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ && + DEPENDS + ) + endif() -else(WIN32) +else() -function(harvest from to) - set(pattern "") - foreach(f ${ARGN}) - set(pattern ${f}) - endforeach() + function(harvest from to) + set(pattern "") + foreach(f ${ARGN}) + set(pattern ${f}) + endforeach() - if(pattern STREQUAL "") - get_filename_component(dirpath ${to} DIRECTORY) - get_filename_component(filename ${to} NAME) - install( - FILES ${LIBDIR}/${from} - DESTINATION ${HARVEST_TARGET}/${dirpath} - RENAME ${filename}) - else() - install( - DIRECTORY ${LIBDIR}/${from}/ - DESTINATION ${HARVEST_TARGET}/${to} - USE_SOURCE_PERMISSIONS - FILES_MATCHING PATTERN ${pattern} - PATTERN "pkgconfig" EXCLUDE - PATTERN "cmake" EXCLUDE - PATTERN "__pycache__" EXCLUDE - PATTERN "tests" EXCLUDE) - endif() -endfunction() + if(pattern STREQUAL "") + get_filename_component(dirpath ${to} DIRECTORY) + get_filename_component(filename ${to} NAME) + install( + FILES ${LIBDIR}/${from} + DESTINATION ${HARVEST_TARGET}/${dirpath} + RENAME ${filename} + ) + else() + install( + DIRECTORY ${LIBDIR}/${from}/ + DESTINATION ${HARVEST_TARGET}/${to} + USE_SOURCE_PERMISSIONS + FILES_MATCHING PATTERN ${pattern} + PATTERN "pkgconfig" EXCLUDE + PATTERN "cmake" EXCLUDE + PATTERN "__pycache__" EXCLUDE + PATTERN "tests" EXCLUDE + ) + endif() + endfunction() -harvest(alembic/include alembic/include "*.h") -harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a) -harvest(alembic/bin alembic/bin "*") -harvest(brotli/include brotli/include "*.h") -harvest(brotli/lib brotli/lib "*.a") -harvest(boost/include boost/include "*") -harvest(boost/lib boost/lib "*.a") -harvest(imath/include imath/include "*.h") -harvest(imath/lib imath/lib "*.a") -harvest(ffmpeg/include ffmpeg/include "*.h") -harvest(ffmpeg/lib ffmpeg/lib "*.a") -harvest(fftw3/include fftw3/include "*.h") -harvest(fftw3/lib fftw3/lib "*.a") -harvest(flac/lib sndfile/lib "libFLAC.a") -harvest(freetype/include freetype/include "*.h") -harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a) -harvest(glew/include glew/include "*.h") -harvest(glew/lib glew/lib "*.a") -harvest(gmp/include gmp/include "*.h") -harvest(gmp/lib gmp/lib "*.a") -harvest(jemalloc/include jemalloc/include "*.h") -harvest(jemalloc/lib jemalloc/lib "*.a") -harvest(jpeg/include jpeg/include "*.h") -harvest(jpeg/lib jpeg/lib "libjpeg.a") -harvest(lame/lib ffmpeg/lib "*.a") -if(NOT APPLE) - harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h") - harvest(level-zero/lib level-zero/lib "*.so*") -endif() -harvest(llvm/bin llvm/bin "clang-format") -if(BUILD_CLANG_TOOLS) - harvest(llvm/bin llvm/bin "clang-tidy") - harvest(llvm/share/clang llvm/share "run-clang-tidy.py") -endif() -harvest(llvm/include llvm/include "*") -harvest(llvm/bin llvm/bin "llvm-config") -harvest(llvm/lib llvm/lib "libLLVM*.a") -harvest(llvm/lib llvm/lib "libclang*.a") -harvest(llvm/lib/clang llvm/lib/clang "*.h") -if(APPLE) - harvest(openmp/lib openmp/lib "*") - harvest(openmp/include openmp/include "*.h") -endif() -if(BLENDER_PLATFORM_ARM) - harvest(sse2neon sse2neon "*.h") -endif() -harvest(ogg/lib ffmpeg/lib "*.a") -harvest(openal/include openal/include "*.h") -if(UNIX AND NOT APPLE) - harvest(openal/lib openal/lib "*.a") + harvest(alembic/include alembic/include "*.h") + harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a) + harvest(alembic/bin alembic/bin "*") + harvest(brotli/include brotli/include "*.h") + harvest(brotli/lib brotli/lib "*.a") + harvest(boost/include boost/include "*") + harvest(boost/lib boost/lib "*.a") + harvest(imath/include imath/include "*.h") + harvest(imath/lib imath/lib "*.a") + harvest(ffmpeg/include ffmpeg/include "*.h") + harvest(ffmpeg/lib ffmpeg/lib "*.a") + harvest(fftw3/include fftw3/include "*.h") + harvest(fftw3/lib fftw3/lib "*.a") + harvest(flac/lib sndfile/lib "libFLAC.a") + harvest(freetype/include freetype/include "*.h") + harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a) + harvest(glew/include glew/include "*.h") + harvest(glew/lib glew/lib "*.a") + harvest(gmp/include gmp/include "*.h") + harvest(gmp/lib gmp/lib "*.a") + harvest(jemalloc/include jemalloc/include "*.h") + harvest(jemalloc/lib jemalloc/lib "*.a") + harvest(jpeg/include jpeg/include "*.h") + harvest(jpeg/lib jpeg/lib "libjpeg.a") + harvest(lame/lib ffmpeg/lib "*.a") + if(NOT APPLE) + harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h") + harvest(level-zero/lib level-zero/lib "*.so*") + endif() + harvest(llvm/bin llvm/bin "clang-format") + if(BUILD_CLANG_TOOLS) + harvest(llvm/bin llvm/bin "clang-tidy") + harvest(llvm/share/clang llvm/share "run-clang-tidy.py") + endif() + harvest(llvm/include llvm/include "*") + harvest(llvm/bin llvm/bin "llvm-config") + harvest(llvm/lib llvm/lib "libLLVM*.a") + harvest(llvm/lib llvm/lib "libclang*.a") + harvest(llvm/lib/clang llvm/lib/clang "*.h") + if(APPLE) + harvest(openmp/lib openmp/lib "*") + harvest(openmp/include openmp/include "*.h") + endif() + if(BLENDER_PLATFORM_ARM) + harvest(sse2neon sse2neon "*.h") + endif() + harvest(ogg/lib ffmpeg/lib "*.a") + harvest(openal/include openal/include "*.h") + if(UNIX AND NOT APPLE) + harvest(openal/lib openal/lib "*.a") - harvest(blosc/include blosc/include "*.h") - harvest(blosc/lib blosc/lib "*.a") + harvest(blosc/include blosc/include "*.h") + harvest(blosc/lib blosc/lib "*.a") - harvest(zlib/include zlib/include "*.h") - harvest(zlib/lib zlib/lib "*.a") + harvest(zlib/include zlib/include "*.h") + harvest(zlib/lib zlib/lib "*.a") - harvest(xml2/include xml2/include "*.h") - harvest(xml2/lib xml2/lib "*.a") + harvest(xml2/include xml2/include "*.h") + harvest(xml2/lib xml2/lib "*.a") - harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml") -else() - harvest(blosc/lib openvdb/lib "*.a") - harvest(xml2/lib opencollada/lib "*.a") -endif() -harvest(opencollada/include/opencollada opencollada/include "*.h") -harvest(opencollada/lib/opencollada opencollada/lib "*.a") -harvest(opencolorio/include opencolorio/include "*.h") -harvest(opencolorio/lib opencolorio/lib "*.a") -harvest(opencolorio/lib/static opencolorio/lib "*.a") -harvest(openexr/include openexr/include "*.h") -harvest(openexr/lib openexr/lib "*.a") -harvest(openimageio/bin openimageio/bin "idiff") -harvest(openimageio/bin openimageio/bin "maketx") -harvest(openimageio/bin openimageio/bin "oiiotool") -harvest(openimageio/include openimageio/include "*") -harvest(openimageio/lib openimageio/lib "*.a") -harvest(openimagedenoise/include openimagedenoise/include "*") -harvest(openimagedenoise/lib openimagedenoise/lib "*.a") -harvest(embree/include embree/include "*.h") -harvest(embree/lib embree/lib "*.a") -harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h") -harvest(openjpeg/lib openjpeg/lib "*.a") -harvest(opensubdiv/include opensubdiv/include "*.h") -harvest(opensubdiv/lib opensubdiv/lib "*.a") -harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h") -harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h") -harvest(openvdb/lib openvdb/lib "*.a") -harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h") -harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a") -harvest(osl/bin osl/bin "oslc") -harvest(osl/include osl/include "*.h") -harvest(osl/lib osl/lib "*.a") -harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h") -harvest(png/include @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs