Build fixes.

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)

src/base/cmake/option/hwloc.cmake

@@ -1,6 +1,5 @@
 message(STATUS "WITH_HWLOC      \t= ${WITH_HWLOC} (DEBUG=${HWLOC_DEBUG})")
 
-
 if (WITH_HWLOC)
     if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
         add_subdirectory(src/base/3rdparty/hwloc)

src/hw/api/HwApi.cpp

@@ -16,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "hw/api/HwApi.h"
 #include "base/api/interfaces/IApiRequest.h"
 #include "base/tools/String.h"

src/hw/api/HwApi.h

@@ -29,7 +29,7 @@
 namespace xmrig {
 
 
-struct DmiReader;
+class DmiReader;
 
 
 class HwApi : public IApiListener