Commit: 914e3b1645288daf7468ed21527fe6cc78d70938
Author: Campbell Barton
Date: Sun Nov 5 14:50:15 2017 +1100
Branches: master
https://developer.blender.org/rB914e3b1645288daf7468ed21527fe6cc78d70938
Cleanup: indentation, line wrapping
===================================================================
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/alembic.cmake
M build_files/build_environment/cmake/blendthumb.cmake
M build_files/build_environment/cmake/blosc.cmake
M build_files/build_environment/cmake/boost.cmake
M build_files/build_environment/cmake/clang.cmake
M build_files/build_environment/cmake/ffmpeg.cmake
M build_files/build_environment/cmake/fftw.cmake
M build_files/build_environment/cmake/flac.cmake
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/hdf5.cmake
M build_files/build_environment/cmake/llvm.cmake
M build_files/build_environment/cmake/numpy.cmake
M build_files/build_environment/cmake/opencollada.cmake
M build_files/build_environment/cmake/opencolorio.cmake
M build_files/build_environment/cmake/openexr.cmake
M build_files/build_environment/cmake/openimageio.cmake
M build_files/build_environment/cmake/openjpeg.cmake
M build_files/build_environment/cmake/opensubdiv.cmake
M build_files/build_environment/cmake/openvdb.cmake
M build_files/build_environment/cmake/options.cmake
M build_files/build_environment/cmake/osl.cmake
M build_files/build_environment/cmake/png.cmake
M build_files/build_environment/cmake/pthreads.cmake
M build_files/build_environment/cmake/python.cmake
M build_files/build_environment/cmake/python_site_packages.cmake
M build_files/build_environment/cmake/schroedinger.cmake
M build_files/build_environment/cmake/sndfile.cmake
M build_files/build_environment/cmake/theora.cmake
M build_files/build_environment/cmake/tiff.cmake
M build_files/build_environment/cmake/vorbis.cmake
M
build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
===================================================================
diff --git a/build_files/build_environment/CMakeLists.txt
b/build_files/build_environment/CMakeLists.txt
index 9f7eb3c2c50..885133f970c 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -78,7 +78,7 @@ include(cmake/openvdb.cmake)
include(cmake/python.cmake)
include(cmake/python_site_packages.cmake)
include(cmake/numpy.cmake)
-if (WITH_WEBP)
+if(WITH_WEBP)
include(cmake/webp.cmake)
endif()
if(WIN32)
diff --git a/build_files/build_environment/cmake/alembic.cmake
b/build_files/build_environment/cmake/alembic.cmake
index a49047ec102..cf2cefa2e7a 100644
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@ -72,4 +72,9 @@ ExternalProject_Add(external_alembic
INSTALL_DIR ${LIBDIR}/alembic
)
-add_dependencies(external_alembic external_boost external_zlib
external_ilmbase)
+add_dependencies(
+ external_alembic
+ external_boost
+ external_zlib
+ external_ilmbase
+)
diff --git a/build_files/build_environment/cmake/blendthumb.cmake
b/build_files/build_environment/cmake/blendthumb.cmake
index 624869971c6..b3064016403 100644
--- a/build_files/build_environment/cmake/blendthumb.cmake
+++ b/build_files/build_environment/cmake/blendthumb.cmake
@@ -47,7 +47,10 @@ if(BUILD_MODE STREQUAL Release)
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)
+ add_dependencies(
+ external_blendthumb_32
+ external_zlib_32
+ )
ExternalProject_Add(external_blendthumb_64
CMAKE_GENERATOR ${GENERATOR_64}
@@ -56,6 +59,9 @@ if(BUILD_MODE STREQUAL Release)
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)
+ add_dependencies(
+ external_blendthumb_64
+ external_zlib_64
+ )
endif()
endif()
diff --git a/build_files/build_environment/cmake/blosc.cmake
b/build_files/build_environment/cmake/blosc.cmake
index 68df525b802..606fe8c61cc 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -37,7 +37,13 @@ ExternalProject_Add(external_blosc
INSTALL_DIR ${LIBDIR}/blosc
)
-add_dependencies(external_blosc external_zlib)
+add_dependencies(
+ external_blosc
+ external_zlib
+)
if(WIN32)
- add_dependencies(external_blosc external_pthreads)
+ add_dependencies(
+ external_blosc
+ external_pthreads
+ )
endif()
diff --git a/build_files/build_environment/cmake/boost.cmake
b/build_files/build_environment/cmake/boost.cmake
index d98df30a38f..2c6bf195e07 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -103,5 +103,8 @@ ExternalProject_Add(external_boost
)
if(WIN32)
- add_dependencies(external_boost Make_Python_Environment)
+ add_dependencies(
+ external_boost
+ Make_Python_Environment
+ )
endif()
diff --git a/build_files/build_environment/cmake/clang.cmake
b/build_files/build_environment/cmake/clang.cmake
index 2c7f271b5fc..9a2705bc8be 100644
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -32,15 +32,15 @@ ExternalProject_Add(external_clang
INSTALL_DIR ${LIBDIR}/clang
)
-if (MSVC)
- if (BUILD_MODE STREQUAL Release)
- set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/ )
+if(MSVC)
+ if(BUILD_MODE STREQUAL Release)
+ set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
else()
set(CLANG_HARVEST_COMMAND
- ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
- ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
- ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
- )
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/
${HARVEST_TARGET}/llvm/debug/lib/ &&
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/
${HARVEST_TARGET}/llvm/debug/bin/ &&
+ ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
+ )
endif()
ExternalProject_Add_Step(external_clang after_install
COMMAND ${CLANG_HARVEST_COMMAND}
@@ -48,4 +48,7 @@ if (MSVC)
)
endif()
-add_dependencies(external_clang ll)
+add_dependencies(
+ external_clang
+ ll
+)
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake
b/build_files/build_environment/cmake/ffmpeg.cmake
index 2a45849acf5..bd49621bf26 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -30,13 +30,14 @@ if(WIN32)
--enable-w32threads
--disable-pthreads
--enable-libopenjpeg
- )
+ )
else()
set(FFMPEG_EXTRA_FLAGS
${FFMPEG_EXTRA_FLAGS}
--enable-static
--disable-shared
- --enable-libopenjpeg)
+ --enable-libopenjpeg
+ )
endif()
if(APPLE)
@@ -102,18 +103,34 @@ ExternalProject_Add(external_ffmpeg
--disable-indev=jack
--disable-indev=alsa
--disable-outdev=alsa
- PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d
${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
- BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
- INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
- INSTALL_DIR ${LIBDIR}/ffmpeg
+ PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d
${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+ BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
+ INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd
${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg
${DEFAULT_CMAKE_FLAGS}
+ INSTALL_DIR ${LIBDIR}/ffmpeg
)
if(MSVC)
set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
-endif(MSVC)
+endif()
-add_dependencies(external_ffmpeg external_zlib external_faad external_openjpeg
external_xvidcore external_x264 external_schroedinger external_vpx
external_theora external_vorbis external_ogg external_lame)
+add_dependencies(
+ external_ffmpeg
+ external_zlib
+ external_faad
+ external_openjpeg
+ external_xvidcore
+ external_x264
+ external_schroedinger
+ external_vpx
+ external_theora
+ external_vorbis
+ external_ogg
+ external_lame
+)
if(WIN32)
- add_dependencies(external_ffmpeg external_zlib_mingw)
+ add_dependencies(
+ external_ffmpeg
+ external_zlib_mingw
+ )
endif()
diff --git a/build_files/build_environment/cmake/fftw.cmake
b/build_files/build_environment/cmake/fftw.cmake
index e6e6165199c..3044e28078d 100644
--- a/build_files/build_environment/cmake/fftw.cmake
+++ b/build_files/build_environment/cmake/fftw.cmake
@@ -37,4 +37,4 @@ ExternalProject_Add(external_fftw3
if(MSVC)
set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-endif(MSVC)
+endif()
diff --git a/build_files/build_environment/cmake/flac.cmake
b/build_files/build_environment/cmake/flac.cmake
index 74d222632d0..f5ef5809b40 100644
--- a/build_files/build_environment/cmake/flac.cmake
+++ b/build_files/build_environment/cmake/flac.cmake
@@ -29,4 +29,4 @@ ExternalProject_Add(external_flac
if(MSVC)
set_target_properties(external_flac PROPERTIES FOLDER Mingw)
-endif(MSVC)
+endif()
diff --git a/build_files/build_environment/cmake/harvest.cmake
b/build_files/build_environment/cmake/harvest.cmake
index a430c4b33bf..f23939a7ba6 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -26,7 +26,6 @@ endif()
message("HARVEST_TARGET = ${HARVEST_TARGET}")
if(WIN32)
-
if(BUILD_MODE STREQUAL Release)
add_custom_target(Harvest_Release_Results
# Zlib Rename the lib file and copy the
include/bin folders
@@ -117,8 +116,8 @@ if(BUILD_MODE STREQUAL Release)
# webp, straight up copy
${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/webp ${HARVEST_TARGET}/webp
DEPENDS
-)
-endif(BUILD_MODE STREQUAL Release)
+ )
+endif()
if(BUILD_MODE STREQUAL Debug)
add_custom_target(Harvest_Debug_Results
@@ -169,8 +168,8 @@ if(BUILD_MODE STREQUAL Debug)
# python
${CMAKE_COMMAND} -E copy
${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
DEPENDS Package_Python
-)
-endif(BUILD_MODE STREQUAL Debug)
+ )
+endif()
else(WIN32)
@@ -276,4 +275,4 @@ harvest(x264/lib ffmpeg/lib "*.a")
harvest(xml2/lib opencollada/lib "*.a")
harvest(xvidcore/lib ffmpeg/lib "*.a")
-endif(WIN32)
+endif()
diff --git a/build_files/build_environment/cmake/hdf5.cmake
b/build_files/build_environment/cmake/hdf5.cmake
index 09d40d0605f..63ad14761da 100644
--- a/build_files/build_environment/cmake/hdf5.cmake
+++ b/build_files/build_environment/cmake/hdf5.cmake
@@ -32,11 +32,11 @@ if(WIN32)
endif()
ExternalProject_Add(external_hdf5
- URL ${HDF5_URI}
- DOWNLOAD_DIR ${DOWNLOAD_DIR}
- URL_HASH MD5=${HDF5_HASH}
- PREFIX ${BUILD_DIR}/hdf5
- PATCH_COMMAND ${HDF5_PATCH}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
- INSTALL_DIR ${LIBDIR}/hdf5
+ URL ${HDF5_URI}
+ DOWNLOAD_DIR ${DOWNLOAD_DIR}
+ URL_HASH MD5=${HDF5_HASH}
+ PREFIX ${BUILD_DIR}/hdf5
+ PATCH_COMMAND ${HDF5_PATCH}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
+ INSTALL_DIR ${LIBDIR}/hdf5
)
diff --git a/build_files/build_environment/cmake/llvm.cmake
b/build_files/build_environment/cmake/llvm.cmake
index f04fe609cb3..60f94b3a499 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -43,15 +43,15 @@ ExternalProject_Add(ll
INSTALL_DIR ${LIBDIR}/llvm
)
-if (MSVC)
- if (BU
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
