From a53caab12b6e58da3bbb5c3436db473733bcad5f Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Fri, 3 Jan 2014 17:17:50 -0600 Subject: [PATCH] force switch to boost::context, add --force option to bzr clean-tree --- CMakeModules/download_boost.cmake | 2 +- common/CMakeLists.txt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake index 74395f11cb..9d87d5cb1b 100644 --- a/CMakeModules/download_boost.cmake +++ b/CMakeModules/download_boost.cmake @@ -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" diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 20101747ad..44569f29e2 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -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 )