fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use internal hwloc for MSVC.

Browse source
This commit is contained in:
XMRig 2019-07-28 09:24:53 +07:00
parent a39e0e05e9
commit 2b29b81b89
58 changed files with 32562 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/backend/cpu/cpu.cmake
View file

@ -19,12 +19,18 @@ set(SOURCES_BACKEND_CPU
if (WITH_HWLOC)
find_package(HWLOC REQUIRED)
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()
set(WITH_LIBCPUID OFF)
include_directories(${HWLOC_INCLUDE_DIR})
remove_definitions(/DXMRIG_FEATURE_LIBCPUID)
add_definitions(/DXMRIG_FEATURE_HWLOC)
@ -32,7 +38,6 @@ if (WITH_HWLOC)
add_definitions(/DXMRIG_HWLOC_DEBUG)
endif()
set(CPUID_LIB "")
set(SOURCES_CPUID
src/backend/cpu/platform/BasicCpuInfo.cpp
src/backend/cpu/platform/BasicCpuInfo.h