Skip to content

K
kicad-source-mirror
Commit b08c85f6 authored by Marco Serantoni's avatar Marco Serantoni
Browse files
Options

[MacOSX] Removing freetype dependecy for Cairo (uses cocoa font management)

parent 2d53c8ee
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
CMakeModules/download_cairo.cmake
View file @ b08c85f6
...@@ -41,7 +41,7 @@ if (APPLE) ...@@ -41,7 +41,7 @@ if (APPLE)
if( CMAKE_OSX_ARCHITECTURES ) if( CMAKE_OSX_ARCHITECTURES )
set( CAIRO_CFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES}" ) set( CAIRO_CFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES}" )
set( CAIRO_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -framework CoreServices -framework Cocoa" ) set( CAIRO_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -framework CoreServices -framework Cocoa" )
set( CAIRO_OPTS "--enable-quartz-image" ) set( CAIRO_OPTS --enable-ft=no )
endif( CMAKE_OSX_ARCHITECTURES ) endif( CMAKE_OSX_ARCHITECTURES )
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
...@@ -80,6 +80,7 @@ ExternalProject_Add( cairo ...@@ -80,6 +80,7 @@ ExternalProject_Add( cairo
--disable-silent-rules --disable-dependency-tracking --disable-silent-rules --disable-dependency-tracking
${CAIRO_CFLAGS} ${CAIRO_CFLAGS}
${CAIRO_LDFLAGS} ${CAIRO_LDFLAGS}
${CAIRO_OPTS}
#BINARY_DIR "${PREFIX}" #BINARY_DIR "${PREFIX}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment