Compare commits

...

5 Commits

Author SHA1 Message Date
Nicholas Dudfield
8e26d0db47 fix: workaround soci's overly zealous boost 2025-06-30 10:11:22 +07:00
Nicholas Dudfield
302bf92802 fix: workaround soci's overly zealous boost 2025-06-27 13:01:56 +07:00
Nicholas Dudfield
b57b76ea8b fix: link to boost::headers 2025-06-27 12:02:45 +07:00
Nicholas Dudfield
c4bb35f462 fix: link to boost::headers 2025-06-27 11:56:52 +07:00
Nicholas Dudfield
ff7bdbef70 fix: remove vestigial -DBOOST_ASIO_DISABLE_CONCEPTS usage 2025-06-26 16:01:10 +07:00
3 changed files with 2 additions and 3 deletions

View File

@@ -91,7 +91,6 @@ jobs:
run: |
conan profile new default --detect || true # Ignore error if profile exists
conan profile update settings.compiler.cppstd=20 default
conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
- name: Install dependencies
uses: ./.github/actions/xahau-ga-dependencies

View File

@@ -2,7 +2,7 @@ name: Nix - GA Runner
on:
push:
branches: ["dev", "candidate", "release"]
branches: ["dev", "candidate", "release", "nd-link-to-boost-2025-06-27"]
pull_request:
branches: ["dev", "candidate", "release"]

View File

@@ -154,7 +154,7 @@ class SociConan(ConanFile):
self.cpp_info.components["soci_core"].set_property("cmake_target_name", "SOCI::soci_core{}".format(target_suffix))
self.cpp_info.components["soci_core"].libs = ["{}soci_core{}".format(lib_prefix, lib_suffix)]
if self.options.with_boost:
self.cpp_info.components["soci_core"].requires.append("boost::boost")
self.cpp_info.components["soci_core"].requires.append("boost::headers")
# soci_empty
if self.options.empty: