shithub: freetype+ttf2subf

git/fs: mount .git/fs: mount/attach disallowed

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -115,6 +115,10 @@

 endif ()

+# Add local cmake modules

+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds)

 if (BUILD_FRAMEWORK)

   if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")

     message(FATAL_ERROR

@@ -124,19 +128,29 @@

   set(BUILD_SHARED_LIBS ON)

 endif ()

 set(VERSION_MAJOR "2")

 set(VERSION_MINOR "6")

 set(VERSION_PATCH "0")

 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})

 # Compiler definitions for building the library

 add_definitions(-DFT2_BUILD_LIBRARY)

+# Find dependencies

+find_package(ZLIB)

+find_package(BZip2)

+find_package(PNG)

+find_package(HarfBuzz)

 message(STATUS

   "Creating directory ${PROJECT_BINARY_DIR}/include/freetype/config")

 file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include/freetype/config")

 # Create the configuration file

 if (UNIX)

   check_include_file("unistd.h" HAVE_UNISTD_H)

@@ -170,6 +184,36 @@

 endif ()

+# Create the options file

+message(STATUS

+  "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")

+file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftoption.h"

+  FTOPTION_H)

+if (ZLIB_FOUND)

+  string(REGEX REPLACE

+    "/\\* +(#define +FT_CONFIG_OPTION_SYSTEM_ZLIB) +\\*/" "\\1"

+    FTOPTION_H "${FTOPTION_H}")

+endif ()

+if (BZIP2_FOUND)

+  string(REGEX REPLACE

+    "/\\* +(#define +FT_CONFIG_OPTION_USE_BZIP2) +\\*/" "\\1"

+    FTOPTION_H "${FTOPTION_H}")

+endif ()

+if (PNG_FOUND)

+  string(REGEX REPLACE

+    "/\\* +(#define +FT_CONFIG_OPTION_USE_PNG) +\\*/" "\\1"

+    FTOPTION_H "${FTOPTION_H}")

+endif ()

+if (HARFBUZZ_FOUND)

+  string(REGEX REPLACE

+    "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1"

+    FTOPTION_H "${FTOPTION_H}")

+endif ()

+file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h"

+  "${FTOPTION_H}")

 # Specify library include directories

 include_directories("${PROJECT_SOURCE_DIR}/include")

 include_directories(BEFORE "${PROJECT_BINARY_DIR}/include")

@@ -257,6 +301,26 @@

     XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"

 endif ()

+if (ZLIB_FOUND)

+  target_link_libraries(freetype ${ZLIB_LIBRARIES})

+  include_directories(${ZLIB_INCLUDE_DIRS})

+endif ()

+if (BZIP2_FOUND)

+  target_link_libraries(freetype ${BZIP2_LIBRARIES})

+  include_directories(${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS

+endif ()

+if (PNG_FOUND)

+  add_definitions(${PNG_DEFINITIONS})

+  target_link_libraries(freetype ${PNG_LIBRARIES})

+  include_directories(${PNG_INCLUDE_DIRS})

+endif ()

+if (HARFBUZZ_FOUND)

+  target_link_libraries(freetype ${HARFBUZZ_LIBRARIES})

+  include_directories(${HARFBUZZ_INCLUDE_DIRS})

+endif ()

 # Installations

 # Note the trailing slash in the argument to the `DIRECTORY' directive

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,18 @@

 2015-06-28  Werner Lemberg  <[email protected]>

+	[cmake] Check for libraries and create `ftoption.h'.

+	* builds/FindHarfBuzz.cmake: New file, taken from

+	  https://trac.webkit.org/browser/trunk/Source/cmake/FindHarfBuzz.cmake

+	* CMakeLists.Txt: Add path to local cmake modules.

+	Find dependencies for zlib, bzip2, libpng, and harfbuzz.

+	Create `ftoption.h' file.

+	Set up include and linker stuff for libraries.

+2015-06-28  Werner Lemberg  <[email protected]>

 	* CMakeLists.txt: Fix creation of `ftconfig.h'.

 	Check for UNIX header files using `check_include_file'.

 	Set up correct header include directories.

--- /dev/null

+++ b/builds/FindHarfBuzz.cmake

@@ -1,0 +1,61 @@

+# Copyright (c) 2012, Intel Corporation

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions are met:

+#

+# * Redistributions of source code must retain the above copyright notice, this

+#   list of conditions and the following disclaimer.

+# * Redistributions in binary form must reproduce the above copyright notice,

+#   this list of conditions and the following disclaimer in the documentation

+#   and/or other materials provided with the distribution.

+# * Neither the name of Intel Corporation nor the names of its contributors may

+#   be used to endorse or promote products derived from this software without

+#   specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+# POSSIBILITY OF SUCH DAMAGE.

+#

+# Try to find Harfbuzz include and library directories.

+#

+# After successful discovery, this will set for inclusion where needed:

+# HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers

+# HARFBUZZ_LIBRARIES - containg the HarfBuzz library

+include(FindPkgConfig)

+pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)

+find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h

+    HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}

+)

+find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz

+    HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}

+)

+# HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.

+if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")

+    pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)

+    find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu

+        HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}

+    )

+    list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")

+endif ()

+include(FindPackageHandleStandardArgs)

+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)

+mark_as_advanced(

+    HARFBUZZ_ICU_LIBRARIES

+    HARFBUZZ_INCLUDE_DIRS

+    HARFBUZZ_LIBRARIES

+)