Fixed linking to gzip libs

This commit is contained in:
Ben Gräf 2019-10-24 22:29:47 +02:00
parent 143ae3cc90
commit 36db19cb02

View file

@ -21,7 +21,7 @@ option(WITH_HTTP "Enable HTTP protocol support (client/server)" ON)
option(WITH_CN_EXTREMELITE "CryptoNight-Extremelite support" ON) option(WITH_CN_EXTREMELITE "CryptoNight-Extremelite support" ON)
option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_DEBUG_LOG "Enable debug log output" OFF)
option(WITH_TLS "Enable OpenSSL support" ON) option(WITH_TLS "Enable OpenSSL support" ON)
option(WITH_ZLIB "Enabled gzip compression on CC (client/server)") option(WITH_ZLIB "Enabled gzip compression on CC (client/server)" OFF)
option(WITH_ASM "Enable ASM PoW implementations" ON) option(WITH_ASM "Enable ASM PoW implementations" ON)
option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF) option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
option(WITH_CC_CLIENT "CC Client" ON) option(WITH_CC_CLIENT "CC Client" ON)
@ -262,6 +262,7 @@ if (WITH_CC_SERVER OR WITH_CC_CLIENT)
src/cc/GPUInfo.cpp) src/cc/GPUInfo.cpp)
if (WITH_ZLIB) if (WITH_ZLIB)
set(ZLIB_ROOT ${XMRIG_DEPS})
find_package(ZLIB) find_package(ZLIB)
add_definitions(/DCPPHTTPLIB_ZLIB_SUPPORT) add_definitions(/DCPPHTTPLIB_ZLIB_SUPPORT)
endif() endif()
@ -280,7 +281,7 @@ if (WITH_DEBUG_LOG)
endif() endif()
add_executable(xmrigMiner ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES} ${SOURCES_CC_CLIENT} ${SOURCES_CC_COMMON}) add_executable(xmrigMiner ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES} ${SOURCES_CC_CLIENT} ${SOURCES_CC_COMMON})
target_link_libraries(xmrigMiner ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY}) target_link_libraries(xmrigMiner ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ZLIB_LIBRARIES})
set_target_properties(xmrigMiner PROPERTIES OUTPUT_NAME ${MINER_EXECUTABLE_NAME}) set_target_properties(xmrigMiner PROPERTIES OUTPUT_NAME ${MINER_EXECUTABLE_NAME})
add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc) add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc)