From 64fcf4c2b6bfca215ad3ad4723782942c312383d Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Sat, 6 Aug 2022 20:11:31 +0200 Subject: [PATCH] fix: Conan does not seem to properly use the `project` prefix for the `-c` parameter Resolves #384 --- .github/workflows/codeql-analysis.yml | 2 +- docs/usage.rst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 092c1deb..2d85b143 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -85,7 +85,7 @@ jobs: conan config init conan remote add upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss mkdir _lgtm_build_dir && cd _lgtm_build_dir - conan install .. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -c mp-units:user.build:all=True -c user.build:skip_docs=True -b outdated -u + conan install .. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -c user.build:all=True -c user.build:skip_docs=True -b outdated -u conan build .. - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/docs/usage.rst b/docs/usage.rst index c8a22e3b..46d9e549 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -414,7 +414,7 @@ you should: .. code-block:: shell git clone https://github.com/mpusz/units.git && cd units - conan install . -pr -s compiler.cppstd=20 -c mp-units:user.build:all=True -c user.build:skip_docs=True -b outdated -u + conan install . -pr -s compiler.cppstd=20 -c user.build:all=True -c user.build:skip_docs=True -b outdated -u conan build . The above will download and install all of the dependencies needed for the development of the library, @@ -443,7 +443,7 @@ In case you would like to build the project's documentation, you should: git clone https://github.com/mpusz/units.git && cd units pip3 install -r docs/requirements.txt - conan install . -pr -s compiler.cppstd=20 -c mp-units:user.build:all=True -b missing + conan install . -pr -s compiler.cppstd=20 -c user.build:all=True -b missing cmake --preset default cmake --build --preset release --target documentation @@ -457,7 +457,7 @@ To test CMake installation and Conan packaging or create a Conan package run: .. code-block:: shell - conan create . / -pr -s compiler.cppstd=20 -c mp-units:user.build:all=True -c user.build:skip_docs=True -b outdated -u + conan create . / -pr -s compiler.cppstd=20 -c user.build:all=True -c user.build:skip_docs=True -b outdated -u The above will create a Conan package and run tests provided in *./test_package* directory.