Merge branch 'develop'
This commit is contained in:
commit
bd4bc9a2c4
1 changed files with 2 additions and 2 deletions
|
@ -16,11 +16,11 @@ set(Boost_USE_STATIC_LIBS ON)
|
||||||
|
|
||||||
if(NOT MINER_EXECUTABLE_NAME)
|
if(NOT MINER_EXECUTABLE_NAME)
|
||||||
set(MINER_EXECUTABLE_NAME "xmrigMiner" CACHE STRING "Miner executable file name")
|
set(MINER_EXECUTABLE_NAME "xmrigMiner" CACHE STRING "Miner executable file name")
|
||||||
endif(MINER_EXECUTABLE_NAME)
|
endif(NOT MINER_EXECUTABLE_NAME)
|
||||||
|
|
||||||
if(NOT DAEMON_EXECUTABLE_NAME)
|
if(NOT DAEMON_EXECUTABLE_NAME)
|
||||||
set(DAEMON_EXECUTABLE_NAME "xmrigDaemon" CACHE STRING "Daemon executable file name")
|
set(DAEMON_EXECUTABLE_NAME "xmrigDaemon" CACHE STRING "Daemon executable file name")
|
||||||
endif(DAEMON_EXECUTABLE_NAME)
|
endif(NOT DAEMON_EXECUTABLE_NAME)
|
||||||
|
|
||||||
include (CheckIncludeFile)
|
include (CheckIncludeFile)
|
||||||
include (cmake/cpu.cmake)
|
include (cmake/cpu.cmake)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue