diff --git a/stdair-fix-protected-pointer-with-boost-archive.patch b/stdair-fix-protected-pointer-with-boost-archive.patch index e7d158c..f3455c7 100644 --- a/stdair-fix-protected-pointer-with-boost-archive.patch +++ b/stdair-fix-protected-pointer-with-boost-archive.patch @@ -1,15 +1,14 @@ diff --git a/config/project_config_embeddable.cmake b/config/project_config_embeddable.cmake -index b9f38e6..a115cb0 100644 +index b9f38e6..07901ff 100644 --- a/config/project_config_embeddable.cmake +++ b/config/project_config_embeddable.cmake -@@ -165,6 +165,10 @@ macro (set_project_options _build_doc _enable_tests _run_gcov) - set (BASICDOC_FILES AUTHORS ${DOC_NEWS_FILE} README ${DOC_INSTALL_FILE}) - set (BASICDOC_PATH "share/doc/${PACKAGE}") - +@@ -1387,6 +1387,9 @@ macro (init_build) + if (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VERSION=${Boost_VERSION}") + endif (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=") + ## + # Work around for new Boost 1.63 serialization code -+ set (DONT_USE_HAS_NEW_OPERATOR 1) -+ - endmacro (set_project_options) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDONT_USE_HAS_NEW_OPERATOR=1") - # + # + include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})