From fc9bb9cfe9f29627d8ffaa35cd8b49b09dd24eea Mon Sep 17 00:00:00 2001 From: Arugula Bowl Date: Tue, 19 Jun 2018 21:28:28 +0000 Subject: [PATCH] Move rai/lib library definition to separate CMakeLists.txt --- CMakeLists.txt | 27 +-------------- rai/lib/CMakeLists.txt | 45 +++++++++++++++++++++++++ rai/{ => lib}/plat/default/priority.cpp | 0 rai/{ => lib}/plat/linux/priority.cpp | 0 rai/{ => lib}/plat/windows/priority.cpp | 0 5 files changed, 46 insertions(+), 26 deletions(-) create mode 100644 rai/lib/CMakeLists.txt rename rai/{ => lib}/plat/default/priority.cpp (100%) rename rai/{ => lib}/plat/linux/priority.cpp (100%) rename rai/{ => lib}/plat/windows/priority.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30afe777..c517c451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,19 +237,15 @@ add_library (blake2 ${BLAKE2_IMPLEMENTATION}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set (PLATFORM_LIB_SOURCE rai/plat/default/priority.cpp) set (PLATFORM_SECURE_SOURCE rai/plat/osx/working.mm) set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set (PLATFORM_LIB_SOURCE rai/plat/windows/priority.cpp) set (PLATFORM_SECURE_SOURCE rai/plat/windows/working.cpp) set (PLATFORM_WALLET_SOURCE rai/plat/windows/icon.cpp RaiBlocks.rc) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set (PLATFORM_LIB_SOURCE rai/plat/linux/priority.cpp) set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp) set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp) elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set (PLATFORM_LIB_SOURCE rai/plat/default/priority.cpp) set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp) set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp) else () @@ -280,25 +276,7 @@ add_library (secure rai/versioning.hpp rai/versioning.cpp) -SET (RAI_LIB_SOURCES - ${PLATFORM_LIB_SOURCE} - rai/lib/errors.hpp - rai/lib/errors.cpp - rai/lib/expected.hpp - rai/lib/blocks.cpp - rai/lib/blocks.hpp - rai/lib/interface.cpp - rai/lib/interface.h - rai/lib/numbers.cpp - rai/lib/numbers.hpp - rai/lib/utility.cpp - rai/lib/utility.hpp - rai/lib/work.hpp - rai/lib/work.cpp) - -add_library (rai_lib SHARED ${RAI_LIB_SOURCES}) -add_library (rai_lib_static STATIC ${RAI_LIB_SOURCES}) - +add_subdirectory(rai/lib) add_subdirectory(rai/node) SET (ACTIVE_NETWORK rai_live_network CACHE STRING "Selects which network parameters are used") @@ -398,9 +376,6 @@ if (RAIBLOCKS_GUI) target_link_libraries (nano_wallet node secure lmdb ed25519 rai_lib_static qt argon2 ${OPENSSL_LIBRARIES} ${CRYPTOPP_LIBRARY} libminiupnpc-static ${Boost_ATOMIC_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_THREAD_LIBRARY} Qt5::Core Qt5::Gui Qt5::Widgets ${QT_QTGUI_LIBRARY} ${PLATFORM_LIBS} ${PLATFORM_WALLET_LIBS}) endif (RAIBLOCKS_GUI) -target_link_libraries (rai_lib ed25519 xxhash blake2 ${CRYPTOPP_LIBRARY}) -target_link_libraries (rai_lib_static ed25519 xxhash blake2 ${CRYPTOPP_LIBRARY}) - target_link_libraries (rai_node node secure lmdb ed25519 rai_lib_static argon2 ${OPENSSL_LIBRARIES} ${CRYPTOPP_LIBRARY} libminiupnpc-static ${Boost_ATOMIC_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_THREAD_LIBRARY} ${PLATFORM_LIBS}) set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) diff --git a/rai/lib/CMakeLists.txt b/rai/lib/CMakeLists.txt new file mode 100644 index 00000000..eb2db575 --- /dev/null +++ b/rai/lib/CMakeLists.txt @@ -0,0 +1,45 @@ +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set (platform_sources plat/default/priority.cpp) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set (platform_sources plat/windows/priority.cpp) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set (platform_sources plat/linux/priority.cpp) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set (platform_sources plat/default/priority.cpp) +else () + error ("Unknown platform: ${CMAKE_SYSTEM_NAME}") +endif () + + +SET (sources + ${platform_sources} + errors.hpp + errors.cpp + expected.hpp + blocks.cpp + blocks.hpp + interface.cpp + interface.h + numbers.cpp + numbers.hpp + utility.cpp + utility.hpp + work.hpp + work.cpp) + +add_library (rai_lib SHARED ${sources}) +add_library (rai_lib_static STATIC ${sources}) + +target_link_libraries (rai_lib + ed25519 + xxhash + blake2 + ${CRYPTOPP_LIBRARY} + Boost::boost) + +target_link_libraries (rai_lib_static + ed25519 + xxhash + blake2 + ${CRYPTOPP_LIBRARY} + Boost::boost) diff --git a/rai/plat/default/priority.cpp b/rai/lib/plat/default/priority.cpp similarity index 100% rename from rai/plat/default/priority.cpp rename to rai/lib/plat/default/priority.cpp diff --git a/rai/plat/linux/priority.cpp b/rai/lib/plat/linux/priority.cpp similarity index 100% rename from rai/plat/linux/priority.cpp rename to rai/lib/plat/linux/priority.cpp diff --git a/rai/plat/windows/priority.cpp b/rai/lib/plat/windows/priority.cpp similarity index 100% rename from rai/plat/windows/priority.cpp rename to rai/lib/plat/windows/priority.cpp