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
290a60a4
Commit
290a60a4
authored
Jan 06, 2014
by
Marco Serantoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MacOSX] Fixing STL && single processor building in pixman
parent
54bbba6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
CMakeLists.txt
CMakeLists.txt
+2
-2
download_pixman.cmake
CMakeModules/download_pixman.cmake
+2
-0
No files found.
CMakeLists.txt
View file @
290a60a4
...
@@ -170,8 +170,8 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
...
@@ -170,8 +170,8 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
endif
()
endif
()
if
(
APPLE
)
if
(
APPLE
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-D__ASSERTMACROS__"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-D__ASSERTMACROS__
-mmacosx-version-min=10.5
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D__ASSERTMACROS__"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D__ASSERTMACROS__
-mmacosx-version-min=10.5
"
)
endif
()
endif
()
endif
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
endif
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
...
...
CMakeModules/download_pixman.cmake
View file @
290a60a4
...
@@ -40,6 +40,8 @@ set( PREFIX ${DOWNLOAD_DIR}/pixman )
...
@@ -40,6 +40,8 @@ set( PREFIX ${DOWNLOAD_DIR}/pixman )
if
(
APPLE
)
if
(
APPLE
)
if
(
CMAKE_OSX_ARCHITECTURES
)
if
(
CMAKE_OSX_ARCHITECTURES
)
set
(
PIXMAN_CPPFLAGS
"CFLAGS=-arch
${
CMAKE_OSX_ARCHITECTURES
}
-fno-common -mmacosx-version-min=10.5"
)
set
(
PIXMAN_CPPFLAGS
"CFLAGS=-arch
${
CMAKE_OSX_ARCHITECTURES
}
-fno-common -mmacosx-version-min=10.5"
)
else
()
set
(
PIXMAN_CPPFLAGS
"CFLAGS=-fno-common -mmacosx-version-min=10.5"
)
endif
(
CMAKE_OSX_ARCHITECTURES
)
endif
(
CMAKE_OSX_ARCHITECTURES
)
endif
(
APPLE
)
endif
(
APPLE
)
...
...
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