Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
moneroexamples 2018-03-15 09:07:08 +08:00
commit 136fd94aab
2 changed files with 5 additions and 6 deletions

View file

@ -110,7 +110,6 @@ set(LIBRARIES
blocks blocks
lmdb lmdb
ringct ringct
ringct_basic
device device
common common
mnemonics mnemonics

View file

@ -57,11 +57,11 @@ foreach (l ${LIBS})
endforeach() endforeach()
if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a) #if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
add_library(ringct_basic STATIC IMPORTED) # add_library(ringct_basic STATIC IMPORTED)
set_property(TARGET ringct_basic # set_property(TARGET ringct_basic
PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a) # PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
endif() #endif()
message(STATUS ${MONERO_SOURCE_DIR}/build) message(STATUS ${MONERO_SOURCE_DIR}/build)