diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 92598fc1..af9f64fd 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -20,7 +20,7 @@ jobs: build_dir=\${2} pip install conan --break-system-packages conan profile detect - conan install \$root_dir --install-folder=build --build=missing --settings=build_type=Release -c tools.system.package_manager:mode=install + conan install \$root_dir --output-folder=build --build=missing --settings=build_type=Release -c tools.system.package_manager:mode=install wget https://sdk.lunarg.com/sdk/download/1.3.216.0/linux/vulkansdk-linux-x86_64-1.3.216.0.tar.gz tar xf vulkansdk-linux-x86_64-1.3.216.0.tar.gz -C \$root_dir/dependencies source \$root_dir/dependencies/1.3.216.0/setup-env.sh" > init_script.sh @@ -28,6 +28,7 @@ jobs: - name: Run static analysis uses: JacobDomagala/StaticAnalysis@master with: + cmake_args: -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release exclude_dir: dependencies init_script: init_script.sh apt_pckgs: xorg-dev python3-pip diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 20d859b3..556b89fb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -47,7 +47,7 @@ jobs: run: | # Use newer ABI conan profile detect - conan install $GITHUB_WORKSPACE --install-folder=build --build=missing --settings=build_type=$BUILD_TYPE + conan install $GITHUB_WORKSPACE --output-folder=build --build=missing --settings=build_type=$BUILD_TYPE - name: Run CMake shell: bash @@ -55,7 +55,8 @@ jobs: run: | source ${{runner.workspace}}/Looper/$SDK_VERSION/setup-env.sh cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWARNINGS_AS_ERRORS=ON -DENABLE_INCLUDE_WHAT_YOU_USE=OFF\ - -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=OFF -DENABLE_SANITIZER_LEAK=ON -DUNITY_BUILD=ON + -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=OFF -DENABLE_SANITIZER_LEAK=ON -DUNITY_BUILD=ON\ + -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake - name: Build working-directory: ${{runner.workspace}}/build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c809fe37..ad37da41 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,14 +51,14 @@ jobs: working-directory: ${{runner.workspace}}/build run: | conan profile detect - conan install $env:GITHUB_WORKSPACE --install-folder=build --build=missing --settings=build_type=$env:BUILD_TYPE + conan install $env:GITHUB_WORKSPACE --output-folder=build --build=missing --settings=build_type=$env:BUILD_TYPE - name: Configure CMake and build working-directory: ${{runner.workspace}}/build run: | $env:VULKAN_SDK="$env:VULKAN_DIR\$env:SDK_VERSION" - cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE + cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake cmake --build . --config $env:BUILD_TYPE > output.txt cat output.txt diff --git a/README.md b/README.md index 1b820fed..9a5338ef 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,6 @@ The typical build process would look like this: # Create build directory mkdir build && cd build -# Use newer ABI -conan profile new default --detect -conan profile update settings.compiler.libcxx=libstdc++11 default conan install .. --output-folder=build --build=missing --settings=build_type=Release # Generate build system for Windows/Linux