[Bf-blender-cvs] [59805fa7e0d] newboolean: Merge branch 'master' into newboolean

[Howard Trickey]

Commit: 59805fa7e0d11b2775f984c5c73b684b1468bba1
Author: Howard Trickey
Date:   Wed Jun 17 08:58:20 2020 -0400
Branches: newboolean
https://developer.blender.org/rB59805fa7e0d11b2775f984c5c73b684b1468bba1

Merge branch 'master' into newboolean

===================================================================



===================================================================

diff --cc build_files/cmake/macros.cmake
index c4c179a78da,efe05d0bf5f..aaa256b01a6
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -437,13 -437,8 +437,12 @@@ function(SETUP_LIBDIRS
  
      if(WITH_ALEMBIC)
        link_directories(${ALEMBIC_LIBPATH})
-       link_directories(${HDF5_LIBPATH})
      endif()
  
 +    if(WITH_GMP)
 +      link_directories(${GMP_LIBPATH})
 +    endif()
 +
      if(WITH_GHOST_WAYLAND)
        link_directories(
          ${wayland-client_LIBRARY_DIRS}