Browse Source

Re-apply megasource changes to FreeType's cmakelists

Alex Szpakowski 8 years ago
parent
commit
06bb7045e3
1 changed files with 4 additions and 1 deletions
  1. 4 1
      libs/freetype-2.8/CMakeLists.txt

+ 4 - 1
libs/freetype-2.8/CMakeLists.txt

@@ -364,7 +364,7 @@ endif ()
 
 if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
   target_include_directories(freetype
-    PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
+    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