Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
7e9ab703
Commit
7e9ab703
authored
Jan 22, 2014
by
Marco Serantoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MacOSX] Fixing in the case -arch are not set with cairo
parent
f3256a91
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
download_cairo.cmake
CMakeModules/download_cairo.cmake
+11
-6
No files found.
CMakeModules/download_cairo.cmake
View file @
7e9ab703
...
...
@@ -38,16 +38,21 @@ find_package( BZip2 REQUIRED )
set
(
PREFIX
${
DOWNLOAD_DIR
}
/cairo
)
if
(
APPLE
)
if
(
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_OPTS --enable-ft=no
)
endif
(
CMAKE_OSX_ARCHITECTURES
)
set
(
CAIRO_CFLAGS
"CFLAGS="
)
set
(
CAIRO_LDFLAGS
"LDFLAGS=-framework CoreServices -framework Cocoa"
)
set
(
CAIRO_OPTS --enable-ft=no
)
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
set
(
CAIRO_CFLAGS
"
${
CAIRO_CFLAGS
}
-fno-lto"
)
endif
()
if
(
CMAKE_OSX_ARCHITECTURES
)
set
(
CAIRO_CFLAGS
"-arch
${
CMAKE_OSX_ARCHITECTURES
}
"
)
set
(
CAIRO_LDFLAGS
"-arch
${
CMAKE_OSX_ARCHITECTURES
}
"
)
endif
(
CMAKE_OSX_ARCHITECTURES
)
if
(
CMAKE_OSX_SYSROOT
)
#set( CAIRO_CFLAGS "${CAIRO_CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
set
(
CAIRO_LDFLAGS
"
${
CAIRO_LDFLAGS
}
-isysroot
${
CMAKE_OSX_SYSROOT
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment