IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Landry Breuil's 'boost-1.87' into stable.

Browse Source 
Makes the boost-1.67 requirement hard, no patched earlier versions are
supported.
This commit is contained in:
John Ralls
2024-11-26 15:45:14 -08:00
parent 764157ddeb c07e74ef7d
commit 64a319eb46
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -581,23 +581,9 @@ find_package (Boost 1.67.0 COMPONENTS date_time filesystem locale program_option
if (Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
set(HAVE_BOOST 1)
else()
find_package (Boost 1.60.0 REQUIRED COMPONENTS date_time regex locale filesystem system program_options)
if (Boost_FOUND)
include (CheckIncludeFileCXX)
set(CMAKE_REQUIRED_FLAGS "-std=c++17")
set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
check_include_file_cxx("boost/locale.hpp" AUTO_PTR)
unset(CMAKE_REQUIRED_FLAGS)
unset(CMAKE_REQUIRED_INCLUDES)
if(AUTO_PTR)
include_directories(${Boost_INCLUDE_DIRS})
set(HAVE_BOOST 1)
endif()
endif()
endif()
if (NOT HAVE_BOOST)
message (SEND_ERROR "A suitable Boost is not installed, and is required. GnuCash requires that Boost be compatible and compiled with C++17. Boost 1.67 is the first compatible release but some distributions have patched earlier ones to work with C++17. Please install it and ensure that the following libraries are built: date_time, filesystem, locale, regex, program_options and system.")
message (SEND_ERROR "A suitable Boost is not installed, and is required. GnuCash requires that Boost be compatible and compiled with C++17. Please install it and ensure that the following libraries are built: date_time, filesystem, locale, regex, program_options and system.")
endif()

5
README.dependencies
View File

@@ -72,11 +72,6 @@ Libraries/Deps
regex libraries.
locale and regex libs must be
built with ICU support.
Note that 1.67.0 is the first
*release* that supports C++17,
but that some distributions
have patched earlier versions
to work.
swig 3.0.12 Makes Guile and Python Bindings.
webkit 2.4.11 (Windows,
2.14.1 (Everything Else)

2
libgnucash/app-utils/gnc-quotes.cpp
View File

@@ -205,7 +205,7 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c
try
{
std::future<std::vector<char> > out_buf, err_buf;
boost::asio::io_service svc;
boost::asio::io_context svc;
auto input_buf = bp::buffer (json_string);
bp::child process;