marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some OSX-specific hacks from the main CMakeLists

issue1247
Nicolas Hake 2015-01-23 17:15:56 +01:00
parent f4e95ea85c
commit 53ff6da5ef
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -825,14 +825,9 @@ else()
endif() endif()
if(NOT USE_CONSOLE) if(NOT USE_CONSOLE)
if(APPLE)
include(LegacyFindFreetype)
include_directories(${FREETYPE_INCLUDE_DIRS})
else()
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
include_directories(${FREETYPE_INCLUDE_DIRS}) include_directories(${FREETYPE_INCLUDE_DIRS})
endif() endif()
endif()
# FINDLIB works the same as find_library, but also marks the resulting var as # FINDLIB works the same as find_library, but also marks the resulting var as
# advanced so it doesn't show in GUIs by default # advanced so it doesn't show in GUIs by default

2
cmake/FindFreetype.cmake
View File

@ -19,7 +19,7 @@
# Use pkg-config if possible instead of doing guesswork like the default CMake module does # Use pkg-config if possible instead of doing guesswork like the default CMake module does
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND AND NOT APPLE)
set(_ft_pkgconfig_args "") set(_ft_pkgconfig_args "")
if(FREETYPE_FIND_REQUIRED) if(FREETYPE_FIND_REQUIRED)
set(_ft_pkgconfig_args "${_ft_pkgconfig_args}REQUIRED ") set(_ft_pkgconfig_args "${_ft_pkgconfig_args}REQUIRED ")