Skip to content

cmake fix #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MungoG merged 2 commits into from
Jan 21, 2026
Merged

cmake fix #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63a60e9
cmake fix and rename files as duplicate names was causing b2 build er…
MungoG Jan 20, 2026
5ef14b2
Add corosio to the library dependencies in ci.yml
MungoG Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,13 @@ jobs:
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
path: capy-root

- name: Clone Corosio
uses: actions/checkout@v4
with:
repository: cppalliance/corosio
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
path: corosio-root

- name: Clone Boost
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
id: boost-clone
Expand All @@ -307,7 +314,7 @@ jobs:
boost-dir: boost-source
modules-exclude-paths: ''
scan-modules-dir: http-root
scan-modules-ignore: http,capy
scan-modules-ignore: http,capy,corosio

- name: ASLR Fix
if: ${{ startsWith(matrix.runs-on, 'ubuntu' )}}
Expand All @@ -334,6 +341,7 @@ jobs:
# Remove module from boost-source
rm -r "boost-source/libs/$module" || true
rm -r "boost-source/libs/capy" || true
rm -r "boost-source/libs/corosio" || true

# Copy cached boost-source to an isolated boost-root
cp -r boost-source boost-root
Expand All @@ -350,6 +358,9 @@ jobs:
# Patch boost-root with capy dependency
cp -r "$workspace_root"/capy-root "libs/capy"

# Patch boost-root with corosio dependency
cp -r "$workspace_root"/corosio-root "libs/corosio"

- name: Boost B2 Workflow
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
if: ${{ !matrix.coverage }}
Expand Down Expand Up @@ -541,7 +552,7 @@ jobs:
with:
apt-get: git cmake

- name: Clone Boost.Corosio
- name: Clone Boost.Http
uses: actions/checkout@v4
with:
path: http-root
Expand All @@ -553,6 +564,13 @@ jobs:
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
path: capy-root

- name: Clone Corosio
uses: actions/checkout@v4
with:
repository: cppalliance/corosio
ref: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
path: corosio-root

- name: Clone Boost
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
id: boost-clone
Expand All @@ -561,7 +579,7 @@ jobs:
boost-dir: boost-source
modules-exclude-paths: ''
scan-modules-dir: http-root
scan-modules-ignore: http,capy
scan-modules-ignore: http,capy,corosio

- name: Patch Boost
id: patch
Expand All @@ -583,6 +601,7 @@ jobs:
# Remove module from boost-source
rm -r "boost-source/libs/$module" || true
rm -r "boost-source/libs/capy" || true
rm -r "boost-source/libs/corosio" || true

# Copy cached boost-source to an isolated boost-root
cp -r boost-source boost-root
Expand All @@ -599,6 +618,9 @@ jobs:
# Patch boost-root with capy dependency
cp -r "$workspace_root"/capy-root "libs/capy"

# Patch boost-root with corosio dependency
cp -r "$workspace_root"/corosio-root "libs/corosio"

- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
/.vscode/
/.cache/
/.clangd
/build/*
!/build/Jamfile
/out/
CMakeUserPresets.json
/CMakeUserPresets.json
/tmpclaude-*-cwd

# CMake artifacts (if accidentally run from source dir)
#CMakeCache.txt
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ endforeach ()
# Conditional dependencies
if (NOT BOOST_URL_MRDOCS_BUILD)
if (BOOST_HTTP_BUILD_TESTS)
set(BOOST_HTTP_UNIT_TEST_LIBRARIES filesystem)
set(BOOST_HTTP_UNIT_TEST_LIBRARIES asio filesystem)
Comment on lines 77 to +79
Copy link

@coderabbitai coderabbitai bot Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Pre-existing issue: Variable name mismatch.

Line 77 checks BOOST_URL_MRDOCS_BUILD, but the option defined on line 40 is BOOST_HTTP_MRDOCS_BUILD. This means the condition NOT BOOST_URL_MRDOCS_BUILD will always evaluate to true (unless BOOST_URL_MRDOCS_BUILD is set externally), which may not be the intended behavior.

Suggested fix (outside the scope of this PR) 
-if (NOT BOOST_URL_MRDOCS_BUILD)
+if (NOT BOOST_HTTP_MRDOCS_BUILD)
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (NOT BOOST_URL_MRDOCS_BUILD)
if (BOOST_HTTP_BUILD_TESTS)
set(BOOST_HTTP_UNIT_TEST_LIBRARIES filesystem)
set(BOOST_HTTP_UNIT_TEST_LIBRARIES asio filesystem)
if (NOT BOOST_HTTP_MRDOCS_BUILD)
if (BOOST_HTTP_BUILD_TESTS)
set(BOOST_HTTP_UNIT_TEST_LIBRARIES asio filesystem)
🤖 Prompt for AI Agents 
In `@CMakeLists.txt` around lines 77 - 79, The CMake conditional uses the wrong
variable name: change the check from BOOST_URL_MRDOCS_BUILD to the intended
BOOST_HTTP_MRDOCS_BUILD so the block governed by the existing option behaves
correctly; update the if condition that currently reads NOT
BOOST_URL_MRDOCS_BUILD to use NOT BOOST_HTTP_MRDOCS_BUILD (the other symbols in
the block are BOOST_HTTP_BUILD_TESTS and BOOST_HTTP_UNIT_TEST_LIBRARIES).

endif ()
if (BOOST_HTTP_BUILD_EXAMPLES)
# set(BOOST_HTTP_EXAMPLE_LIBRARIES json)
Expand Down
0 test/unit/bcrypt/error.cpp → test/unit/bcrypt/bcrypt_error.cpp
View file
Open in desktop
File renamed without changes.
0 test/unit/bcrypt/hash.cpp → test/unit/bcrypt/bcrypt_hash.cpp
View file
Open in desktop
File renamed without changes.
0 test/unit/bcrypt/result.cpp → test/unit/bcrypt/bcrypt_result.cpp
View file
Open in desktop
File renamed without changes.
0 test/unit/bcrypt/version.cpp → test/unit/bcrypt/bcrypt_version.cpp
View file
Open in desktop
File renamed without changes.
Loading