Commit: ce37092668806525f9ebd2188a8feb4bd1677899 Author: Howard Trickey Date: Fri Jun 26 08:36:23 2020 -0400 Branches: newboolean https://developer.blender.org/rBce37092668806525f9ebd2188a8feb4bd1677899
Merge branch 'master' into newboolean =================================================================== =================================================================== diff --cc build_files/build_environment/cmake/versions.cmake index 96b0d445a07,5ec5553079c..4596ae943e4 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@@ -312,8 -308,6 +308,12 @@@ set(MESA_HASH d60828056d77bfdbae0970f9b set(XR_OPENXR_SDK_VERSION 1.0.8) set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz) set(XR_OPENXR_SDK_HASH c6de63d2e0f9029aa58dfa97cad8ce07) + +set(GMP_VERSION 6.2.0) +set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz) +set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1) + + set(ISPC_VERSION v1.13.0) + set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz) + set(ISPC_HASH 4bf5e8d0020c4b9980faa702c1a6f25f) ++ diff --cc tests/gtests/blenlib/CMakeLists.txt index 6c19854df96,31c8e983292..d3fbc6bfaba --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@@ -65,9 -60,9 +65,10 @@@ BLENDER_TEST(BLI_math_base "bf_blenlib" BLENDER_TEST(BLI_math_bits "bf_blenlib") BLENDER_TEST(BLI_math_color "bf_blenlib") BLENDER_TEST(BLI_math_geom "bf_blenlib") + BLENDER_TEST(BLI_math_matrix "bf_blenlib") BLENDER_TEST(BLI_math_vector "bf_blenlib") BLENDER_TEST(BLI_memiter "bf_blenlib") +BLENDER_TEST(BLI_mesh_intersect "bf_blenlib") BLENDER_TEST(BLI_optional "bf_blenlib") BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}") BLENDER_TEST(BLI_polyfill_2d "bf_blenlib") _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
