From e3b5bfeb3695f4a0bfeeb7e26c1a2ae79cf3b833 Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 30 Aug 2021 23:41:53 +0700 Subject: [PATCH] Build fixes. --- cmake/randomx.cmake | 4 ++-- src/backend/cpu/cpu.cmake | 20 -------------------- src/base/cmake/cpu.cmake | 2 +- src/base/cmake/option/algorithms.cmake | 16 ++++++++-------- src/base/cmake/option/http.cmake | 2 +- src/base/cmake/option/hwloc.cmake | 3 +-- src/base/cmake/option/sodium.cmake | 2 +- src/base/cmake/option/tls.cmake | 4 ++-- src/hw/api/HwApi.cpp | 1 - src/hw/api/HwApi.h | 2 +- src/hw/dmi/dmi.cmake | 2 +- 11 files changed, 18 insertions(+), 40 deletions(-) diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake index 7dd1220e..67dff831 100644 --- a/cmake/randomx.cmake +++ b/cmake/randomx.cmake @@ -124,5 +124,5 @@ if (WITH_RANDOMX) endif() -message(STATUS "WITH_MSR\t= ${WITH_MSR}") -message(STATUS "WITH_PROFILING\t= ${WITH_PROFILING}") +message(STATUS "WITH_MSR \t= ${WITH_MSR}") +message(STATUS "WITH_PROFILING \t= ${WITH_PROFILING}") diff --git a/src/backend/cpu/cpu.cmake b/src/backend/cpu/cpu.cmake index c485683a..96549882 100644 --- a/src/backend/cpu/cpu.cmake +++ b/src/backend/cpu/cpu.cmake @@ -22,28 +22,8 @@ set(SOURCES_BACKEND_CPU ) if (WITH_HWLOC) - if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) - add_subdirectory(src/3rdparty/hwloc) - include_directories(src/3rdparty/hwloc/include) - set(CPUID_LIB hwloc) - else() - find_package(HWLOC REQUIRED) - include_directories(${HWLOC_INCLUDE_DIR}) - set(CPUID_LIB ${HWLOC_LIBRARY}) - endif() - - add_definitions(/DXMRIG_FEATURE_HWLOC) - - if (HWLOC_DEBUG) - add_definitions(/DXMRIG_HWLOC_DEBUG) - endif() - list(APPEND HEADERS_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.h) list(APPEND SOURCES_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.cpp) -else() - remove_definitions(/DXMRIG_FEATURE_HWLOC) - - set(CPUID_LIB "") endif() if (XMRIG_ARM) diff --git a/src/base/cmake/cpu.cmake b/src/base/cmake/cpu.cmake index 6a406b07..b35ef78b 100644 --- a/src/base/cmake/cpu.cmake +++ b/src/base/cmake/cpu.cmake @@ -9,7 +9,7 @@ if (NOT CMAKE_SYSTEM_PROCESSOR) message(WARNING "CMAKE_SYSTEM_PROCESSOR not defined") endif() -message(STATUS "XMRIG_64_BIT\t= ${XMRIG_64_BIT} (${CMAKE_SYSTEM_PROCESSOR})") +message(STATUS "XMRIG_64_BIT \t= ${XMRIG_64_BIT} (${CMAKE_SYSTEM_PROCESSOR})") if (XMRIG_64_BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") add_definitions(-DRAPIDJSON_SSE2) diff --git a/src/base/cmake/option/algorithms.cmake b/src/base/cmake/option/algorithms.cmake index 5ca2b8c4..66e8558d 100644 --- a/src/base/cmake/option/algorithms.cmake +++ b/src/base/cmake/option/algorithms.cmake @@ -2,14 +2,14 @@ if (WITH_RANDOMX AND NOT WITH_ARGON2) set(WITH_ARGON2 ON) endif() -message(STATUS "WITH_CN_LITE\t= ${WITH_CN_LITE}") -message(STATUS "WITH_CN_HEAVY\t= ${WITH_CN_HEAVY}") -message(STATUS "WITH_CN_PICO\t= ${WITH_CN_PICO}") -message(STATUS "WITH_CN_FEMTO\t= ${WITH_CN_FEMTO}") -message(STATUS "WITH_RANDOMX\t= ${WITH_RANDOMX}") -message(STATUS "WITH_ARGON2\t= ${WITH_ARGON2}") -message(STATUS "WITH_ASTROBWT\t= ${WITH_ASTROBWT}") -message(STATUS "WITH_KAWPOW\t= ${WITH_KAWPOW}") +message(STATUS "WITH_CN_LITE \t= ${WITH_CN_LITE}") +message(STATUS "WITH_CN_HEAVY \t= ${WITH_CN_HEAVY}") +message(STATUS "WITH_CN_PICO \t= ${WITH_CN_PICO}") +message(STATUS "WITH_CN_FEMTO \t= ${WITH_CN_FEMTO}") +message(STATUS "WITH_RANDOMX \t= ${WITH_RANDOMX}") +message(STATUS "WITH_ARGON2 \t= ${WITH_ARGON2}") +message(STATUS "WITH_ASTROBWT \t= ${WITH_ASTROBWT}") +message(STATUS "WITH_KAWPOW \t= ${WITH_KAWPOW}") if (WITH_CN_LITE) add_definitions(-DXMRIG_ALGO_CN_LITE) diff --git a/src/base/cmake/option/http.cmake b/src/base/cmake/option/http.cmake index 520a45f0..d9e8c54e 100644 --- a/src/base/cmake/option/http.cmake +++ b/src/base/cmake/option/http.cmake @@ -1,4 +1,4 @@ -message(STATUS "WITH_HTTP\t= ${WITH_HTTP}") +message(STATUS "WITH_HTTP \t= ${WITH_HTTP}") if (WITH_HTTP) add_definitions(-DXMRIG_FEATURE_HTTP -DXMRIG_FEATURE_API) diff --git a/src/base/cmake/option/hwloc.cmake b/src/base/cmake/option/hwloc.cmake index 85d1973c..a7ee9a83 100644 --- a/src/base/cmake/option/hwloc.cmake +++ b/src/base/cmake/option/hwloc.cmake @@ -1,5 +1,4 @@ -message(STATUS "WITH_HWLOC\t= ${WITH_HWLOC} (DEBUG=${HWLOC_DEBUG})") - +message(STATUS "WITH_HWLOC \t= ${WITH_HWLOC} (DEBUG=${HWLOC_DEBUG})") if (WITH_HWLOC) if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) diff --git a/src/base/cmake/option/sodium.cmake b/src/base/cmake/option/sodium.cmake index 54141864..8f7f5984 100644 --- a/src/base/cmake/option/sodium.cmake +++ b/src/base/cmake/option/sodium.cmake @@ -1,4 +1,4 @@ -message(STATUS "WITH_SODIUM\t= ${WITH_SODIUM}") +message(STATUS "WITH_SODIUM \t= ${WITH_SODIUM}") if (WITH_SODIUM) find_package(Sodium REQUIRED) diff --git a/src/base/cmake/option/tls.cmake b/src/base/cmake/option/tls.cmake index b0313f9f..55192298 100644 --- a/src/base/cmake/option/tls.cmake +++ b/src/base/cmake/option/tls.cmake @@ -20,7 +20,7 @@ if (WITH_TLS) add_definitions(-DXMRIG_FEATURE_TLS) - message(STATUS "WITH_TLS\t= ON (v${OPENSSL_VERSION})") + message(STATUS "WITH_TLS \t= ON (v${OPENSSL_VERSION})") else() - message(STATUS "WITH_TLS\t= ${WITH_TLS}") + message(STATUS "WITH_TLS \t= ${WITH_TLS}") endif() diff --git a/src/hw/api/HwApi.cpp b/src/hw/api/HwApi.cpp index fed5de3f..2814e9f5 100644 --- a/src/hw/api/HwApi.cpp +++ b/src/hw/api/HwApi.cpp @@ -16,7 +16,6 @@ * along with this program. If not, see . */ - #include "hw/api/HwApi.h" #include "base/api/interfaces/IApiRequest.h" #include "base/tools/String.h" diff --git a/src/hw/api/HwApi.h b/src/hw/api/HwApi.h index f434a0a5..9de8dfd5 100644 --- a/src/hw/api/HwApi.h +++ b/src/hw/api/HwApi.h @@ -29,7 +29,7 @@ namespace xmrig { -struct DmiReader; +class DmiReader; class HwApi : public IApiListener diff --git a/src/hw/dmi/dmi.cmake b/src/hw/dmi/dmi.cmake index a03928a6..a5735865 100644 --- a/src/hw/dmi/dmi.cmake +++ b/src/hw/dmi/dmi.cmake @@ -30,4 +30,4 @@ if (WITH_DMI) endif() endif() -message(STATUS "WITH_DMI\t= ${WITH_DMI}") +message(STATUS "WITH_DMI \t= ${WITH_DMI}")