[Bf-blender-cvs] [ffa040d7cbb] tmp_lib_update_32: Merge remote-tracking branch 'origin/master' into tmp_lib_update_32
Ray Molenkamp
noreply at git.blender.org
Sun Feb 13 02:05:36 CET 2022
Commit: ffa040d7cbbaf69c02ded8d66fa07c1421450ce9
Author: Ray Molenkamp
Date: Sat Feb 12 17:39:26 2022 -0700
Branches: tmp_lib_update_32
https://developer.blender.org/rBffa040d7cbbaf69c02ded8d66fa07c1421450ce9
Merge remote-tracking branch 'origin/master' into tmp_lib_update_32
===================================================================
===================================================================
diff --cc build_files/build_environment/cmake/alembic.cmake
index 984220b9142,29251afe58f..484a7849ace
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@@ -1,32 -1,30 +1,16 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # ***** END GPL LICENSE BLOCK *****
+ # SPDX-License-Identifier: GPL-2.0-or-later
set(ALEMBIC_EXTRA_ARGS
- -DBUILDSTATIC=ON
- -DLINKSTATIC=ON
- -DILMBASE_ROOT=${LIBDIR}/openexr
- -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
- -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
- -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
- -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
- -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
- -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
- -DUSE_PYILMBASE=0
- -DUSE_PYALEMBIC=0
- -DUSE_ARNOLD=0
- -DUSE_MAYA=0
- -DUSE_PRMAN=0
- -DUSE_HDF5=Off
- -DUSE_STATIC_HDF5=Off
- -DUSE_TESTS=Off
- -DALEMBIC_NO_OPENGL=1
+ -DImath_ROOT=${LIBDIR}/imath
+ -DUSE_PYALEMBIC=OFF
+ -DUSE_ARNOLD=OFF
+ -DUSE_MAYA=OFF
+ -DUSE_PRMAN=OFF
+ -DUSE_HDF5=OFF
+ -DUSE_TESTS=OFF
-DUSE_BINARIES=ON
- -DALEMBIC_ILMBASE_LINK_STATIC=On
+ -DALEMBIC_ILMBASE_LINK_STATIC=OFF
-DALEMBIC_SHARED_LIBS=OFF
- -DGLUT_INCLUDE_DIR=""
- -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
- -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
)
ExternalProject_Add(external_alembic
diff --cc build_files/build_environment/cmake/boost.cmake
index 94e59bcbd1a,ca60bf832f5..57088e59cee
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@@ -1,22 -1,22 +1,6 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # ***** END GPL LICENSE BLOCK *****
+ # SPDX-License-Identifier: GPL-2.0-or-later
-set(BOOST_ADDRESS_MODEL 64)
-
-if(BLENDER_PLATFORM_ARM)
- set(BOOST_ARCHITECTURE arm)
-else()
- set(BOOST_ARCHITECTURE x86)
-endif()
-
if(WIN32)
- if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
- set(BOOST_TOOLSET toolset=msvc-14.2)
- set(BOOST_COMPILER_STRING -vc142)
- else() # 2017
- set(BOOST_TOOLSET toolset=msvc-14.1)
- set(BOOST_COMPILER_STRING -vc141)
- endif()
-
set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
set(BOOST_BUILD_COMMAND b2)
set(BOOST_BUILD_OPTIONS runtime-link=shared )
diff --cc build_files/build_environment/cmake/boost_build_options.cmake
index bcc0d26f096,00000000000..cc471078fcd
mode 100644,000000..100644
--- a/build_files/build_environment/cmake/boost_build_options.cmake
+++ b/build_files/build_environment/cmake/boost_build_options.cmake
@@@ -1,46 -1,0 +1,30 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # ***** END GPL LICENSE BLOCK *****
++# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(BOOST_ADDRESS_MODEL 64)
+if(BLENDER_PLATFORM_ARM)
+ set(BOOST_ARCHITECTURE arm)
+else()
+ set(BOOST_ARCHITECTURE x86)
+endif()
+
+if(WIN32)
+ if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
+ set(BOOST_TOOLSET toolset=msvc-14.2)
+ set(BOOST_COMPILER_STRING -vc142)
+ else() # 2017
+ set(BOOST_TOOLSET toolset=msvc-14.1)
+ set(BOOST_COMPILER_STRING -vc141)
+ endif()
+endif()
+
+set(DEFAULT_BOOST_FLAGS
+ -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+ -DBoost_USE_MULTITHREADED=ON
+ -DBoost_USE_STATIC_LIBS=ON
+ -DBoost_USE_STATIC_RUNTIME=OFF
+ -DBOOST_ROOT=${LIBDIR}/boost
+ -DBoost_NO_SYSTEM_PATHS=ON
+ -DBoost_NO_BOOST_CMAKE=ON
+ -DBoost_ADDITIONAL_VERSIONS=${BOOST_VERSION_SHORT}
+ -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+)
diff --cc build_files/build_environment/cmake/fmt.cmake
index d183306bfe9,00000000000..74cb9e0c8ad
mode 100644,000000..100644
--- a/build_files/build_environment/cmake/fmt.cmake
+++ b/build_files/build_environment/cmake/fmt.cmake
@@@ -1,30 -1,0 +1,14 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # ***** END GPL LICENSE BLOCK *****
++# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(FMT_EXTRA_ARGS
+ -DFMT_TEST=Off
+)
+
+ExternalProject_Add(external_fmt
+ URL file://${PACKAGE_DIR}/${FMT_FILE}
+ DOWNLOAD_DIR ${DOWNLOAD_DIR}
+ URL_HASH ${FMT_HASH_TYPE}=${FMT_HASH}
+ PREFIX ${BUILD_DIR}/fmt
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fmt ${DEFAULT_CMAKE_FLAGS} ${FMT_EXTRA_ARGS}
+ INSTALL_DIR ${LIBDIR}/fmt
+)
diff --cc build_files/build_environment/cmake/imath.cmake
index a1887cc5f0b,00000000000..e615b667a1e
mode 100644,000000..100644
--- a/build_files/build_environment/cmake/imath.cmake
+++ b/build_files/build_environment/cmake/imath.cmake
@@@ -1,40 -1,0 +1,23 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # ***** END GPL LICENSE BLOCK *****
-
++# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(IMATH_EXTRA_ARGS
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TESTING=OFF
+)
+
+ExternalProject_Add(external_imath
+ URL file://${PACKAGE_DIR}/${IMATH_FILE}
+ DOWNLOAD_DIR ${DOWNLOAD_DIR}
+ URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
+ PREFIX ${BUILD_DIR}/imath
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
+ INSTALL_DIR ${LIBDIR}/imath
+)
+
+if(WIN32)
+ ExternalProject_Add_Step(external_imath after_install
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
+ DEPENDEES install
+ )
+endif()
diff --cc build_files/build_environment/cmake/opensubdiv.cmake
index 84443e752f4,847ff3f6daf..9f6d242ac6f
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@@ -1,41 -1,15 +1,25 @@@
- # ***** BEGIN GPL LICENSE BLOCK *****
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU Ge
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list