From ebdce0e803d5b4db14b3e6f588239f66f6cdee39 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Mon, 20 Dec 2021 04:21:38 +0300 Subject: [PATCH] Add preprocessor definitions --- src/CMakeLists.txt | 4 ++++ src/additional/leveldb | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e592419..f3ab803 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -76,6 +76,7 @@ if(USE_LEVELDB) add_subdirectory(additional/leveldb) list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/txdb-leveldb.cpp) list(APPEND ALL_LIBRARIES leveldb) + list(APPEND ALL_DEFINITIONS USE_LEVELDB) else() list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/txdb-bdb.cpp) endif() @@ -89,8 +90,10 @@ if (USE_ASM) ) list(APPEND ALL_SOURCES ${generic_sources} ${asm_sources}) + list(APPEND ALL_DEFINITIONS USE_ASM) elseif (USE_SSE2) list( APPEND ALL_SOURCES ${generic_sources} ${CMAKE_CURRENT_SOURCE_DIR}/crypto/scrypt/intrin/scrypt-sse2.cpp ) + list(APPEND ALL_DEFINITIONS USE_SSE2) else() list( APPEND ALL_SOURCES ${generic_sources} ${CMAKE_CURRENT_SOURCE_DIR}/crypto/scrypt/generic/scrypt-generic.cpp ) endif() @@ -101,4 +104,5 @@ target_link_libraries(novacoind ${ALL_LIBRARIES}) set_property(TARGET novacoind PROPERTY CXX_STANDARD 17) set_property(TARGET novacoind PROPERTY CXX_STANDARD_REQUIRED TRUE) +set_property(TARGET novacoind PROPERTY COMPILE_DEFINITIONS ${ALL_DEFINITIONS}) set_property(TARGET novacoind PROPERTY CMAKE_WARN_DEPRECATED FALSE) diff --git a/src/additional/leveldb b/src/additional/leveldb index e426c83..4cb80b7 160000 --- a/src/additional/leveldb +++ b/src/additional/leveldb @@ -1 +1 @@ -Subproject commit e426c83e88c4babc785098d905c2dcb4f4e884af +Subproject commit 4cb80b7ddce6ff6089b15d8cfebf746fc1572477 -- 1.7.1