Commit cbcf6664 authored by Dick Hollenbeck's avatar Dick Hollenbeck

force switch to boost::context, add --force option to bzr clean-tree

parent e659d535
...@@ -181,7 +181,7 @@ ExternalProject_Add( boost ...@@ -181,7 +181,7 @@ ExternalProject_Add( boost
# to ignore previously applied patches # to ignore previously applied patches
PATCH_COMMAND bzr revert PATCH_COMMAND bzr revert
# bzr revert is insufficient to remove "added" files: # 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_minkowski.patch"
COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost_cstdint.patch" COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost_cstdint.patch"
......
...@@ -176,10 +176,11 @@ set( COMMON_SRCS ...@@ -176,10 +176,11 @@ set( COMMON_SRCS
geometry/shape_index.cpp 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 # TODO: remove this whole "if test" on or after 14-Jan-2014 and remove the system/*.s
if( UNIX AND NOT APPLE ) # sources if no one complains by then.
else() # boost::context library replaces this functionality:
if( false )
enable_language( C CXX ASM ) enable_language( C CXX ASM )
set_source_files_properties( system/fcontext.s PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp" ) set_source_files_properties( system/fcontext.s PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp" )
list( APPEND COMMON_SRCS system/fcontext.s ) list( APPEND COMMON_SRCS system/fcontext.s )
......
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