forked from Mirrors/openclonk
Remove some OSX-specific hacks from the main CMakeLists
parent
f4e95ea85c
commit
53ff6da5ef
|
@ -825,13 +825,8 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT USE_CONSOLE)
|
if(NOT USE_CONSOLE)
|
||||||
if(APPLE)
|
find_package(Freetype REQUIRED)
|
||||||
include(LegacyFindFreetype)
|
include_directories(${FREETYPE_INCLUDE_DIRS})
|
||||||
include_directories(${FREETYPE_INCLUDE_DIRS})
|
|
||||||
else()
|
|
||||||
find_package(Freetype REQUIRED)
|
|
||||||
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
|
||||||
|
|
|
@ -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 ")
|
||||||
|
|
Loading…
Reference in New Issue