From 1131a97c250b09262dbfc2dcb2ed5750e8997142 Mon Sep 17 00:00:00 2001
From: snider <snider@lt.hn>
Date: Mon, 6 Oct 2025 18:34:44 +0100
Subject: [PATCH] Set C++ standard to C++17 in conanfile.py and update Makefile
 to specify compiler settings

---
 Makefile     | 2 +-
 conanfile.py | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 7c87c19e..83f7fd6c 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ debug: conan-profile-detect
 
 build-deps: conan-profile-detect
 	@echo "Build Dependencies: $(BUILD_TYPE) testnet=$(TESTNET)"
-	$(FIX_ENV) CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) install . --build=missing -s build_type=$(BUILD_TYPE)
+	$(FIX_ENV) CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) install . --build=missing -s compiler.cppstd=17 -s build_type=$(BUILD_TYPE)
 
 configure: build-deps
 	@echo "Running Configure: $(BUILD_TYPE) testnet=$(TESTNET)"
diff --git a/conanfile.py b/conanfile.py
index 29d86224..0d10f9cd 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,7 +1,7 @@
 import os
 
 from conan import ConanFile
-from conan.tools.cmake import cmake_layout, CMakeDeps, CMakeToolchain, CMake
+from conan.tools.cmake import CMakeDeps, CMakeToolchain, CMake
 
 
 class BlockchainConan(ConanFile):
@@ -29,10 +29,6 @@ class BlockchainConan(ConanFile):
         "jwt-cpp/0.7.1"
     ]
 
-    def configure(self):
-        if self.settings.compiler.get_safe("cppstd"):
-            self.settings.compiler.cppstd = "17"
-
     def generate(self):
         tc = CMakeToolchain(self)
         tc.user_presets_path = False