Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-03 17:04:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1007

Browse source 
1de812a cmake: merge libs via virtual object libraries (redfish)
a7498ad cmake: comply with the new policy CMP0026 (redfish)
This commit is contained in:
Riccardo Spagni 2016-09-01 11:21:38 +02:00
commit 9b579773d7
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 12 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/CMakeLists.txt
View file

@ -82,8 +82,13 @@ function (bitmonero_add_library name)
FILES
${ARGN})
add_library("${name}"
${ARGN})
# 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_${name})
add_library(${objlib} OBJECT ${ARGN})
add_library("${name}" STATIC $<TARGET_OBJECTS:${objlib}>)
set_property(TARGET "${name}"
PROPERTY
FOLDER "libs")

7
src/wallet/CMakeLists.txt
View file

@ -27,7 +27,6 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# include (${PROJECT_SOURCE_DIR}/cmake/libutils.cmake)
include (${PROJECT_SOURCE_DIR}/cmake/MergeStaticLibs.cmake)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@ -76,7 +75,11 @@ target_link_libraries(wallet
${EXTRA_LIBRARIES})
set(libs_to_merge wallet cryptonote_core mnemonics common crypto)
merge_static_libs(wallet_merged "${libs_to_merge}")
foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txtA
endforeach()
add_library(wallet_merged STATIC ${objlibs})
install(TARGETS wallet_merged
ARCHIVE DESTINATION lib)