From 8bdcc8746055b0074e05a5b2512589f7355b7ab4 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 29 Oct 2016 15:44:08 -0300 Subject: [PATCH] Re-apply FreeType CMake changes for megasource. --- libs/freetype-2.6.5/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/freetype-2.6.5/CMakeLists.txt b/libs/freetype-2.6.5/CMakeLists.txt index 04fb22a9..8ecd01e8 100644 --- a/libs/freetype-2.6.5/CMakeLists.txt +++ b/libs/freetype-2.6.5/CMakeLists.txt @@ -364,7 +364,7 @@ endif () if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) target_include_directories(freetype - PUBLIC $) + PUBLIC include) endif () if (CMAKE_VERSION VERSION_LESS 2.8.12) @@ -392,6 +392,7 @@ if (HARFBUZZ_FOUND) endif () +if (NOT MEGA) # Installations # Note the trailing slash in the argument to the `DIRECTORY' directive if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) @@ -449,4 +450,6 @@ if (NOT DEFINED FREETYPE_NO_DIST) add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) endif () +endif() # NOT MEGA + # eof