From 469fbb5a189f942b8a273db16ff55c6261d38521 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 30 Mar 2024 14:46:34 +0200 Subject: [PATCH] Improvements for section Building Conan Dependencies. --- Linux-Build-and-Install-Guide.md | 6 ++++-- Macos-Build-Guide.md | 6 ++++-- Windows-Build-Guide.md | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Linux-Build-and-Install-Guide.md b/Linux-Build-and-Install-Guide.md index ce87ce0..eaa0a95 100644 --- a/Linux-Build-and-Install-Guide.md +++ b/Linux-Build-and-Install-Guide.md @@ -392,10 +392,12 @@ Next, navigate to the root directory of your Valentina project and install the p ```bash cd /path/to/valentina -conan install . --build=missing -pr valentina +conan install . --build=missing -o with_xerces=True -pr valentina ``` -By default, the use of Conan is disabled. To enable it, pass `project.enableConan:true` to the Qbs configuration. +This command installs the necessary dependencies for Valentina. The `-o with_xerces=True` option ensures that xerces-c is included in the dependencies and built if it's missing. The `-pr valentina` option specifies the Conan profile named "valentina" to use for the installation. + +By default, Conan integration is disabled in the Qbs configuration. To enable it, you'll need to pass `project.enableConan:true` to the Qbs configuration. To activate the correct Conan settings, you need to pass them to Qbs. To specify that xerces-c library should be built with Conan, you can set `project.conanWithXerces:true` in the Qbs configuration. Additionally, if you want to specify a specific Conan profile to use, you can pass `project.conanProfiles:valentina` to the Qbs configuration. ## Build with Qt Creator diff --git a/Macos-Build-Guide.md b/Macos-Build-Guide.md index 5de1533..2558a97 100644 --- a/Macos-Build-Guide.md +++ b/Macos-Build-Guide.md @@ -363,10 +363,12 @@ Next, navigate to the root directory of your Valentina project and install the p ```bash cd /path/to/valentina -conan install . --build=missing -pr valentina +conan install . --build=missing -o with_xerces=True -pr valentina ``` -By default, the use of Conan is disabled. To enable it, pass `project.enableConan:true` to the Qbs configuration. +This command installs the necessary dependencies for Valentina. The -o with_xerces=True option ensures that xerces-c is included in the dependencies and built if it's missing. The -pr valentina option specifies the Conan profile named "valentina" to use for the installation. + +By default, the use of Conan is disabled. To enable it, pass `project.enableConan:true` to the Qbs configuration. To enable it, you'll need to pass project.enableConan:true to the Qbs configuration. To activate the correct Conan settings, you need to pass them to Qbs. To specify that xerces-c library should be built with Conan, you can set project.conanWithXerces:true in the Qbs configuration. Additionally, if you want to specify a specific Conan profile to use, you can pass project.conanProfiles:valentina to the Qbs configuration. ### Making DMG diff --git a/Windows-Build-Guide.md b/Windows-Build-Guide.md index a2762a2..639c89a 100644 --- a/Windows-Build-Guide.md +++ b/Windows-Build-Guide.md @@ -173,10 +173,11 @@ Next, navigate to the root directory of your Valentina project and install the p ```bash cd /path/to/valentina -conan install . -s os=Windows --build=missing -pr valentina +conan install . -s os=Windows --build=missing -o with_xerces=True -pr valentina ``` +This command installs the necessary dependencies for Valentina. The `-o with_xerces=True` option ensures that xerces-c is included in the dependencies and built if it's missing. The `-pr valentina` option specifies the Conan profile named "valentina" to use for the installation. -By default, the use of Conan is disabled. To enable it, pass `project.enableConan:true` to the Qbs configuration. +By default, the use of Conan is disabled. To enable it, pass `project.enableConan:true` to the Qbs configuration. To enable it, you'll need to pass `project.enableConan:true` to the Qbs configuration. To activate the correct Conan settings, you need to pass them to Qbs. To specify that xerces-c library should be built with Conan, you can set `project.conanWithXerces:true` in the Qbs configuration. Additionally, if you want to specify a specific Conan profile to use, you can pass `project.conanProfiles:valentina` to the Qbs configuration. ### Configuring Qbs for Valentina