From 53ff6da5efae5f55372d1e1f2a693b3e842c97ae Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Fri, 23 Jan 2015 17:15:56 +0100 Subject: [PATCH] Remove some OSX-specific hacks from the main CMakeLists --- CMakeLists.txt | 9 ++------- cmake/FindFreetype.cmake | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98565de0c..a850205df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -825,13 +825,8 @@ else() endif() if(NOT USE_CONSOLE) - if(APPLE) - include(LegacyFindFreetype) - include_directories(${FREETYPE_INCLUDE_DIRS}) - else() - find_package(Freetype REQUIRED) - include_directories(${FREETYPE_INCLUDE_DIRS}) - endif() + find_package(Freetype REQUIRED) + include_directories(${FREETYPE_INCLUDE_DIRS}) endif() # FINDLIB works the same as find_library, but also marks the resulting var as diff --git a/cmake/FindFreetype.cmake b/cmake/FindFreetype.cmake index 439fcfc74..4488bd512 100644 --- a/cmake/FindFreetype.cmake +++ b/cmake/FindFreetype.cmake @@ -19,7 +19,7 @@ # Use pkg-config if possible instead of doing guesswork like the default CMake module does find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) +if(PKG_CONFIG_FOUND AND NOT APPLE) set(_ft_pkgconfig_args "") if(FREETYPE_FIND_REQUIRED) set(_ft_pkgconfig_args "${_ft_pkgconfig_args}REQUIRED ")