Merged branch master into master

This commit is contained in:
BenDroid 2018-03-15 21:44:27 +01:00
commit 1a18ef4511

View file

@ -90,11 +90,13 @@ else()
src/Platform_unix.cpp
)
set(EXTRA_LIBS pthread rt dl)
endif()
if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
set(EXTRA_LIBS pthread rt)
if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
else()
set(EXTRA_LIBS ${EXTRA_LIBS} dl)
endif()
endif()
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@ -251,4 +253,4 @@ if (WITH_CC_SERVER AND MHD_FOUND)
set_target_properties(xmrigCCServer PROPERTIES COMPILE_FLAGS "-DXMRIG_CC_SERVER ${SHARED_FLAGS}")
endif()
add_subdirectory(test EXCLUDE_FROM_ALL)
add_subdirectory(test EXCLUDE_FROM_ALL)