From fd9c56c02516ef86e6ded145d6ee8c8497547698 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Tue, 16 Jul 2024 09:28:16 +0200 Subject: [PATCH 1/3] Update BUILD.md --- BUILD.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index 0b9ef40e61b..a62e59fdd07 100644 --- a/BUILD.md +++ b/BUILD.md @@ -242,7 +242,7 @@ It patches their CMake to correctly import its dependencies. Single-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=TRUE .. ``` Pass the CMake variable [`CMAKE_BUILD_TYPE`][build_type] @@ -252,7 +252,7 @@ It patches their CMake to correctly import its dependencies. Multi-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=TRUE -Dtests=TRUE .. ``` **Note:** You can pass build options for `rippled` in this step. From af3273398055fffb48b4d1e134fcb14a18423a2d Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Sat, 20 Jul 2024 09:20:36 +0200 Subject: [PATCH 2/3] change to `ON` --- BUILD.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD.md b/BUILD.md index a62e59fdd07..78772b6dcc5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -242,7 +242,7 @@ It patches their CMake to correctly import its dependencies. Single-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=TRUE .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=ON .. ``` Pass the CMake variable [`CMAKE_BUILD_TYPE`][build_type] @@ -252,7 +252,7 @@ It patches their CMake to correctly import its dependencies. Multi-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=TRUE -Dtests=TRUE .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=ON -Dtests=ON .. ``` **Note:** You can pass build options for `rippled` in this step. @@ -343,7 +343,7 @@ Example use with some cmake variables set: ``` cd .build conan install .. --output-folder . --build missing --settings build_type=Debug -cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. +cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dxrpld=ON -Dtests=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake .. cmake --build . --target coverage ``` From 1178e3964ef1400d3c6ea72ffef33a567c487e8d Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 22 Jul 2024 18:42:05 +0200 Subject: [PATCH 3/3] Update BUILD.md Co-authored-by: Ed Hennis --- BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index 78772b6dcc5..1d82a9f66fa 100644 --- a/BUILD.md +++ b/BUILD.md @@ -242,7 +242,7 @@ It patches their CMake to correctly import its dependencies. Single-config generators: ``` - cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=ON .. + cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=ON -Dtests=ON .. ``` Pass the CMake variable [`CMAKE_BUILD_TYPE`][build_type]