diff --git a/CMake/Packages/FindFreeType.cmake b/CMake/Packages/FindFreeType.cmake deleted file mode 100644 index 7dca324c5..000000000 --- a/CMake/Packages/FindFreeType.cmake +++ /dev/null @@ -1,62 +0,0 @@ -#snapped from: https://bitbucket.org/sinbad/ogre/src/0bba4f7cdb95/CMake/Packages/FindFreetype.cmake?at=default -#------------------------------------------------------------------- -# This file is part of the CMake build system for OGRE -# (Object-oriented Graphics Rendering Engine) -# For the latest info, see http://www.ogre3d.org/ -# -# The contents of this file are placed in the public domain. Feel -# free to make use of it in any way you like. -#------------------------------------------------------------------- - -# - Try to find FreeType -# Once done, this will define -# -# FREETYPE_FOUND - system has FreeType -# FREETYPE_INCLUDE_DIRS - the FreeType include directories -# FREETYPE_LIBRARIES - link these to use FreeType - -include(FindPkgMacros) -findpkg_begin(FREETYPE) - -# Get path, convert backslashes as ${ENV_${var}} -getenv_path(FREETYPE_HOME) - -# construct search paths -set(FREETYPE_PREFIX_PATH ${FREETYPE_HOME} ${ENV_FREETYPE_HOME}) -create_search_paths(FREETYPE) -# redo search if prefix path changed -clear_if_changed(FREETYPE_PREFIX_PATH - FREETYPE_LIBRARY_FWK - FREETYPE_LIBRARY_REL - FREETYPE_LIBRARY_DBG - FREETYPE_INCLUDE_DIR -) - -set(FREETYPE_LIBRARY_NAMES freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype) -get_debug_names(FREETYPE_LIBRARY_NAMES) - -use_pkgconfig(FREETYPE_PKGC freetype2) - -# prefer static library over framework -set(CMAKE_FIND_FRAMEWORK "LAST") - -message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") -findpkg_framework(FREETYPE) -message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") - -find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) -find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) - -find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) -find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) - -make_library_set(FREETYPE_LIBRARY) - -findpkg_finish(FREETYPE) -mark_as_advanced(FREETYPE_FT2BUILD_INCLUDE_DIR) -if (NOT FREETYPE_FT2BUILD_INCLUDE_DIR STREQUAL FREETYPE_INCLUDE_DIR) - set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_FT2BUILD_INCLUDE_DIR}) -endif () - -# Reset framework finding -set(CMAKE_FIND_FRAMEWORK "FIRST") diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e9aad13c..518e94ecc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(${GLSystem} MATCHES "Desktop OpenGL") else() find_package(OpenGLES REQUIRED) endif() -find_package(FreeType REQUIRED) +find_package(Freetype REQUIRED) find_package(FreeImage REQUIRED) find_package(SDL REQUIRED) find_package(Boost REQUIRED COMPONENTS system filesystem)