diff options
4 files changed, 28 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake index 9afc902531b..1034e9f2029 100644 --- a/build_files/build_environment/cmake/freetype.cmake +++ b/build_files/build_environment/cmake/freetype.cmake @@ -32,5 +32,13 @@ ExternalProject_Add(external_freetype URL_HASH MD5=${FREETYPE_HASH} PREFIX ${BUILD_DIR}/freetype CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS} + PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff INSTALL_DIR ${LIBDIR}/freetype ) + +if(BUILD_MODE STREQUAL Release AND WIN32) + ExternalProject_Add_Step(external_freetype after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype + DEPENDEES install + ) +endif() diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 9ebd5206d27..8519d981964 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -35,8 +35,6 @@ if(BUILD_MODE STREQUAL Release) # jpeg rename libfile + copy include ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ && - # FreeType, straight up copy - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype && # pthreads, rename include dir ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib && diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 9a0c7c02d5a..eefc751a7a4 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -53,9 +53,9 @@ set(OPENEXR_VERSION 2.2.0) set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz) set(OPENEXR_HASH b64e931c82aa3790329c21418373db4e) -set(FREETYPE_VERSION 263) +set(FREETYPE_VERSION 291) set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/ft${FREETYPE_VERSION}.zip) -set(FREETYPE_HASH 0db2a43301572e5c2b4a0864f237aeeb) +set(FREETYPE_HASH 6ca68fc28e443a05f756075d3b1dcb54) set(GLEW_VERSION 1.13.0) set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz) diff --git a/build_files/build_environment/patches/freetype.diff b/build_files/build_environment/patches/freetype.diff new file mode 100644 index 00000000000..cf952234795 --- /dev/null +++ b/build_files/build_environment/patches/freetype.diff @@ -0,0 +1,18 @@ +diff -NaurBb b/CMakeLists.txt a/CMakeLists.txt +--- b/CMakeLists.txt 2018-05-01 12:45:46 -0600 ++++ a/CMakeLists.txt 2018-08-08 13:03:22 -0600 +@@ -229,9 +229,12 @@ + endif () + string(REPLACE "/undef " "#undef " + FTCONFIG_H "${FTCONFIG_H}") +- file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" +- "${FTCONFIG_H}") ++else() ++ file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" ++ FTCONFIG_H) + endif () ++file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" ++ "${FTCONFIG_H}") + + + # Create the options file |