diff options
author | mj-xmr <mjxmr@protonmail.com> | 2021-03-02 09:50:20 +0100 |
---|---|---|
committer | mj-xmr <mjxmr@protonmail.com> | 2021-04-24 09:45:51 +0200 |
commit | b4fe7c24013c86a59087ae7f0dfe9875c794f5be (patch) | |
tree | fd630df9ebc42359bf7c9ccfba225a32dd3e957b /src | |
parent | Merge pull request #7669 (diff) | |
download | monero-b4fe7c24013c86a59087ae7f0dfe9875c794f5be.tar.xz |
epee linkage dynamic; move monero_add_library to main CMakeLists.txt
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9904c5de7..1f89faf98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,30 +79,6 @@ function (monero_add_executable name) monero_set_target_no_relink("${name}") endfunction () -function (monero_add_library name) - monero_add_library_with_deps(NAME "${name}" SOURCES ${ARGN}) -endfunction() - -function (monero_add_library_with_deps) - cmake_parse_arguments(MONERO_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN}) - source_group("${MONERO_ADD_LIBRARY_NAME}" FILES ${MONERO_ADD_LIBRARY_SOURCES}) - - # Define a ("virtual") object library and an actual library that links those - # objects together. The virtual libraries can be arbitrarily combined to link - # any subset of objects into one library archive. This is used for releasing - # libwallet, which combines multiple components. - set(objlib obj_${MONERO_ADD_LIBRARY_NAME}) - add_library(${objlib} OBJECT ${MONERO_ADD_LIBRARY_SOURCES}) - add_library("${MONERO_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>) - monero_set_target_no_relink("${MONERO_ADD_LIBRARY_NAME}") - if (MONERO_ADD_LIBRARY_DEPENDS) - add_dependencies(${objlib} ${MONERO_ADD_LIBRARY_DEPENDS}) - endif() - set_property(TARGET "${MONERO_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs") - target_compile_definitions(${objlib} - PRIVATE $<TARGET_PROPERTY:${MONERO_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>) -endfunction () - include(Version) monero_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion) |