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
cbcf6664
Commit
cbcf6664
authored
Jan 03, 2014
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
force switch to boost::context, add --force option to bzr clean-tree
parent
e659d535
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
download_boost.cmake
CMakeModules/download_boost.cmake
+1
-1
CMakeLists.txt
common/CMakeLists.txt
+5
-4
No files found.
CMakeModules/download_boost.cmake
View file @
cbcf6664
...
...
@@ -181,7 +181,7 @@ ExternalProject_Add( boost
# to ignore previously applied patches
PATCH_COMMAND bzr revert
# bzr revert is insufficient to remove "added" files:
COMMAND bzr clean-tree -q
COMMAND bzr clean-tree -q
--force
COMMAND bzr patch -p0
"
${
PROJECT_SOURCE_DIR
}
/patches/boost_minkowski.patch"
COMMAND bzr patch -p0
"
${
PROJECT_SOURCE_DIR
}
/patches/boost_cstdint.patch"
...
...
common/CMakeLists.txt
View file @
cbcf6664
...
...
@@ -176,10 +176,11 @@ set( COMMON_SRCS
geometry/shape_index.cpp
)
# TODO: remove this whole if test and remove the sytem/*.s sources once every platform is tested with
# boost::context library
if
(
UNIX AND NOT APPLE
)
else
()
# TODO: remove this whole "if test" on or after 14-Jan-2014 and remove the system/*.s
# sources if no one complains by then.
# boost::context library replaces this functionality:
if
(
false
)
enable_language
(
C CXX ASM
)
set_source_files_properties
(
system/fcontext.s PROPERTIES COMPILE_FLAGS
"-x assembler-with-cpp"
)
list
(
APPEND COMMON_SRCS system/fcontext.s
)
...
...
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