diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cd8eb4..07d4f8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,10 @@ set(CMAKE_TOOLCHAIN_FILE ) endif() -include(cmake/conan.cmake) - project(eos-evm-node) +include(cmake/conan.cmake) + set(VERSION_MAJOR 0) set(VERSION_MINOR 7) set(VERSION_PATCH 0) diff --git a/cmake/conan.cmake b/cmake/conan.cmake index 288ddf8..bf40ddf 100644 --- a/cmake/conan.cmake +++ b/cmake/conan.cmake @@ -16,7 +16,11 @@ function(guess_conan_profile) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(PROFILE linux_gcc_11_release) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(PROFILE linux_arm_gcc_11_release) + else() + set(PROFILE linux_gcc_11_release) + endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") set(PROFILE macos_arm_clang_13_release) diff --git a/cmake/profiles/linux_arm_gcc_11_debug b/cmake/profiles/linux_arm_gcc_11_debug new file mode 100644 index 0000000..93d21f9 --- /dev/null +++ b/cmake/profiles/linux_arm_gcc_11_debug @@ -0,0 +1,12 @@ +[settings] +os=Linux +os_build=Linux +arch=armv8 +arch_build=armv8 +compiler=gcc +compiler.version=11 +compiler.libcxx=libstdc++11 +build_type=Debug +[options] +[build_requires] +[env] diff --git a/cmake/profiles/linux_arm_gcc_11_release b/cmake/profiles/linux_arm_gcc_11_release new file mode 100644 index 0000000..2222f46 --- /dev/null +++ b/cmake/profiles/linux_arm_gcc_11_release @@ -0,0 +1,12 @@ +[settings] +os=Linux +os_build=Linux +arch=armv8 +arch_build=armv8 +compiler=gcc +compiler.version=11 +compiler.libcxx=libstdc++11 +build_type=Release +[options] +[build_requires] +[env] diff --git a/external/silkworm b/external/silkworm index dd05bab..8a2b691 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit dd05bab8b702cf67b9691f0eb38c655152672067 +Subproject commit 8a2b691f683f1a392f148c67412aab39b21d31f7