From 72833542a864ab514676331ef4d72c10d913fd8d Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Sat, 28 Sep 2024 06:18:33 -0300 Subject: [PATCH] fix: compilation --- CMakeLists.txt | 2 +- cmake/modules/BaseConfig.cmake | 2 +- qodana.yml | 14 +++++++++++++- src/CMakeLists.txt | 2 -- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 908107b9191..88a286b851d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.29) # CMAKE # apt install build-essential git diff --git a/cmake/modules/BaseConfig.cmake b/cmake/modules/BaseConfig.cmake index 82d32e4b28b..efa2a57cdbd 100644 --- a/cmake/modules/BaseConfig.cmake +++ b/cmake/modules/BaseConfig.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.29) # ***************************************************************************** # CMake Features diff --git a/qodana.yml b/qodana.yml index 4857043fe5d..fb08085c1f4 100644 --- a/qodana.yml +++ b/qodana.yml @@ -9,11 +9,22 @@ bootstrap: | set -e sudo apt-get update && sudo apt-get -y dist-upgrade sudo apt-get purge -y libclang* - sudo apt-get install -y cmake git unzip build-essential ca-certificates curl zip unzip tar pkg-config ninja-build autoconf automake libtool python3 + sudo apt-get install -y git unzip build-essential ca-certificates curl zip tar pkg-config ninja-build autoconf automake libtool python3 + + CMAKE_VERSION=3.29.2 + cd ~ + wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION.tar.gz + tar -xzvf cmake-$CMAKE_VERSION.tar.gz + cd cmake-$CMAKE_VERSION + ./bootstrap -- -DCMAKE_USE_OPENSSL=OFF + make -j$(nproc) + sudo make install + cd ~ git clone https://github.com/Microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh + cd /data/project rm -rf build mkdir -p build @@ -21,6 +32,7 @@ bootstrap: | export CC=/usr/bin/cc export CXX=/usr/bin/c++ cmake -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake .. --preset linux-debug || true + sudo apt-get install -y clang-16 clang-format-16 clang-tidy-16 clang-tools-16 libclang-common-16-dev libclang-cpp16 libclang-rt-16-dev libclang1-16 llvm-16-dev diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab114c6b058..ac14594ea17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.30) - # Base configurations and settings for the project include(BaseConfig) include(GNUInstallDirs)