forked from lthn/blockchain
Set C++ standard to C++17 in conanfile.py and update Makefile to specify compiler settings
This commit is contained in:
parent
958580d91d
commit
1131a97c25
2 changed files with 2 additions and 6 deletions
2
Makefile
2
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)"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue