From 737e94522c0337f2568d67adde8b1d132e550d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Wed, 9 Apr 2025 07:55:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20C++:=2017=20Conan:=201.6?= =?UTF-8?q?6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6d7afb3e72d348f66655da82241ac4a3e965fff5) --- CMakeLists.txt | 7 ++++--- conanfile.txt | 5 +---- src/main.cpp | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1a6a84..e565055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,14 @@ cmake_minimum_required(VERSION 3.30.5) project(conan2_template) -set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD 17) if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake-build-debug/conan_toolchain.cmake) -endif () -if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") +elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake-build-release/conan_toolchain.cmake) +elseif () + message(ERROR!!!) endif () find_package(Boost REQUIRED) diff --git a/conanfile.txt b/conanfile.txt index aabe523..6a55361 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,9 +1,6 @@ [requires] -boost/1.87.0 +boost/1.78.0 [generators] CMakeDeps CMakeToolchain - -[tool_requires] -b2/5.2.0 diff --git a/src/main.cpp b/src/main.cpp index af232e3..f9f0df2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,6 +4,7 @@ #include int main() { + int x = 10; std::cout << "Boost version: " << BOOST_LIB_VERSION << "\n"; return EXIT_SUCCESS;