Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Felke <martin.felke@googlemail.com>2019-04-03 19:51:42 +0300
committerMartin Felke <martin.felke@googlemail.com>2019-04-03 19:51:42 +0300
commitacc20b117da283b6ced52a1bea89ebaea914ab93 (patch)
tree3ca30661c498f9f9b1b7e2d0b19a54fc2106ea91 /build_files/build_environment
parentc6d1ae2f8aa246c009e3cbace0ab0860be8acf3a (diff)
fix for freetype download link and llvm/clang header harvesting
Diffstat (limited to 'build_files/build_environment')
-rw-r--r--build_files/build_environment/cmake/harvest.cmake4
-rw-r--r--build_files/build_environment/cmake/versions.cmake2
2 files changed, 3 insertions, 3 deletions
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)