[Bf-blender-cvs] [acc20b117da] master: fix for freetype download link and llvm/clang header harvesting

Martin Felke noreply at git.blender.org
Wed Apr 3 18:53:34 CEST 2019


Commit: acc20b117da283b6ced52a1bea89ebaea914ab93
Author: Martin Felke
Date:   Wed Apr 3 18:51:42 2019 +0200
Branches: master
https://developer.blender.org/rBacc20b117da283b6ced52a1bea89ebaea914ab93

fix for freetype download link and llvm/clang header harvesting

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

M	build_files/build_environment/cmake/harvest.cmake
M	build_files/build_environment/cmake/versions.cmake

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

diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 702bac97d2f..0e98780e3f0 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -129,8 +129,8 @@ harvest(jpg/include jpeg/include "*.h")
 harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
 harvest(clang/bin llvm/bin "clang-format")
-harvest(clang/include llvm/include "*.h")
-harvest(llvm/include llvm/include "*.h")
+harvest(clang/include llvm/include "*")
+harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 if(APPLE)
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index ab905574985..d3e3f7bea6a 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -71,7 +71,7 @@ else()
 endif()
 
 set(FREETYPE_VERSION 2.9.1)
-set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
 set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
 
 set(GLEW_VERSION 1.13.0)



More information about the Bf-blender-cvs mailing list