Merge remote-tracking branch 'origin/master' into feature/machine_and_kb
This commit is contained in:
@@ -63,6 +63,11 @@ if(MINGW)
|
|||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".dll.a")
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".dll.a")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
# Force using the newest library if it's installed by homebrew
|
||||||
|
set(CMAKE_FIND_FRAMEWORK LAST)
|
||||||
|
endif()
|
||||||
|
|
||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
include_directories(${FREETYPE_INCLUDE_DIRS})
|
include_directories(${FREETYPE_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user