Maj conan dependencies

maxDcb · Sep 3, 2024 · 310b0ab · 310b0ab
1 parent a163a55
commit 310b0ab
Show file tree

Hide file tree

Showing 6 changed files with 672 additions and 19 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -43,7 +43,7 @@ jobs:
       run: conan profile detect
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DWITH_TESTS=OFF
+      run: cmake -B ${{github.workspace}}/build -DWITH_TESTS=OFF -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${{github.workspace}}/conan_provider.cmake
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 18

diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -35,7 +35,7 @@ jobs:
       run: conan profile detect
 
     - name: Configure CMake for tests
-      run: cmake -B ${{github.workspace}}/build
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${{github.workspace}}/conan_provider.cmake
 
     - name: Build for test
       run: cmake --build ${{github.workspace}}/build -j 18

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24.0 FATAL_ERROR)
 
 project(C2TeamServer VERSION 0.0.0 LANGUAGES CXX C)
 set(CMAKE_BUILD_TYPE Release)
@@ -9,17 +9,6 @@ set(CMAKE_CXX_STANDARD 17)
 ## Conan Dependencies
 ##
 
-if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
-	file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
-endif()
-
-include(${CMAKE_BINARY_DIR}/conan.cmake)
-
-conan_cmake_configure(REQUIRES protobuf/3.21.12 boost/1.84.0 openssl/3.2.1 zlib/1.3.1 grpc/1.54.3 spdlog/1.14.1 nlohmann_json/3.11.3 cpp-httplib/0.15.3 GENERATORS CMakeDeps)
-
-conan_cmake_install(PATH_OR_REFERENCE .
-                    BUILD never
-                    SETTINGS ${settings})
 
 set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 

diff --git a/README.md b/README.md
@@ -163,11 +163,11 @@ sudo apt install golang-cfssl
 sudo apt install cmake 
 
 pip3 install pycryptodome
-pip install conan
-pip install grpcio
-pip install PyQt5
-pip install pyqtdarktheme
-pip install protobuf
+pip3 install conan==2.1.0
+pip3 install grpcio==1.66.1
+pip3 install PyQt5
+pip3 install pyqtdarktheme
+pip3 install protobuf==5.27.0
 
 conan profile detect