From 52eb842e23dd082e6baa5e25eaf381bbd8016129 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 16 Feb 2020 01:36:54 +0100 Subject: [PATCH] CMake: update dependencies to latest release --- CMake/Dependencies.cmake | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index b1094f39517..af09e96db64 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -155,43 +155,43 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) execute_process(COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/pugixml-1.10 ${BUILD_COMMAND_OPTS}) - find_package(Freetype) + #find_package(Freetype) if (NOT FREETYPE_FOUND) message(STATUS "Building freetype") file(DOWNLOAD - https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.gz - ${PROJECT_BINARY_DIR}/freetype-2.9.tar.gz) + https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz + ${PROJECT_BINARY_DIR}/freetype-2.10.1.tar.gz) execute_process(COMMAND ${CMAKE_COMMAND} - -E tar xf freetype-2.9.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) + -E tar xf freetype-2.10.1.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) # patch toolchain for iOS execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/CMake/toolchain/ios.toolchain.xcode.cmake - freetype-2.9/builds/cmake/iOS.cmake + freetype-2.10.1/builds/cmake/iOS.cmake WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) execute_process(COMMAND ${BUILD_COMMAND_COMMON} -DBUILD_SHARED_LIBS=${OGREDEPS_SHARED} -DWITH_PNG=OFF - -DWITH_BZip2=OFF # tries to use it on iOS otherwise + -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE # tries to use it on iOS otherwise # workaround for broken iOS toolchain in freetype - -DPROJECT_SOURCE_DIR=${PROJECT_BINARY_DIR}/freetype-2.9 - ${PROJECT_BINARY_DIR}/freetype-2.9 - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/freetype-2.9/objs) + -DPROJECT_SOURCE_DIR=${PROJECT_BINARY_DIR}/freetype-2.10.1 + ${PROJECT_BINARY_DIR}/freetype-2.10.1 + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/freetype-2.10.1/objs) execute_process(COMMAND ${CMAKE_COMMAND} - --build ${PROJECT_BINARY_DIR}/freetype-2.9/objs ${BUILD_COMMAND_OPTS}) + --build ${PROJECT_BINARY_DIR}/freetype-2.10.1/objs ${BUILD_COMMAND_OPTS}) endif() if(MSVC OR MINGW) # other platforms dont need this message(STATUS "Building SDL2") file(DOWNLOAD - https://libsdl.org/release/SDL2-2.0.8.tar.gz - ${PROJECT_BINARY_DIR}/SDL2-2.0.8.tar.gz) + https://libsdl.org/release/SDL2-2.0.10.tar.gz + ${PROJECT_BINARY_DIR}/SDL2-2.0.10.tar.gz) execute_process(COMMAND ${CMAKE_COMMAND} - -E tar xf SDL2-2.0.8.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) + -E tar xf SDL2-2.0.10.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/SDL2-build) execute_process(COMMAND ${BUILD_COMMAND_COMMON} -DSDL_STATIC=FALSE - ${PROJECT_BINARY_DIR}/SDL2-2.0.8 + ${PROJECT_BINARY_DIR}/SDL2-2.0.10 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/SDL2-build) execute_process(COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/SDL2-build ${BUILD_COMMAND_OPTS})