Merge pull request #1007
1de812acmake: merge libs via virtual object libraries (redfish)a7498adcmake: comply with the new policy CMP0026 (redfish)
This commit is contained in:
Riccardo Spagni
commit
9b579773d7
3 changed files with 12 additions and 133 deletions
|
|
@ -1,129 +0,0 @@
|
||||||
# Copyright (C) 2012 Modelon AB
|
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the BSD style license.
|
|
||||||
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# FMILIB_License.txt file for more details.
|
|
||||||
|
|
||||||
# You should have received a copy of the FMILIB_License.txt file
|
|
||||||
# along with this program. If not, contact Modelon AB <http://www.modelon.com>.
|
|
||||||
|
|
||||||
# Merge_static_libs(outlib lib1 lib2 ... libn) merges a number of static
|
|
||||||
# libs into a single static library
|
|
||||||
function(merge_static_libs outlib )
|
|
||||||
set(libs ${ARGV})
|
|
||||||
list(REMOVE_AT libs 0)
|
|
||||||
# Create a dummy file that the target will depend on
|
|
||||||
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/${outlib}_dummy.c)
|
|
||||||
file(WRITE ${dummyfile} "const char * dummy = \"${dummyfile}\";")
|
|
||||||
|
|
||||||
add_library(${outlib} STATIC ${dummyfile})
|
|
||||||
|
|
||||||
if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
|
|
||||||
set(multiconfig FALSE)
|
|
||||||
else()
|
|
||||||
set(multiconfig TRUE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# First get the file names of the libraries to be merged
|
|
||||||
foreach(lib ${libs})
|
|
||||||
get_target_property(libtype ${lib} TYPE)
|
|
||||||
if(NOT libtype STREQUAL "STATIC_LIBRARY")
|
|
||||||
message(FATAL_ERROR "Merge_static_libs can only process static libraries")
|
|
||||||
endif()
|
|
||||||
if(multiconfig)
|
|
||||||
foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
|
|
||||||
get_target_property("libfile_${CONFIG_TYPE}" ${lib} "LOCATION_${CONFIG_TYPE}")
|
|
||||||
list(APPEND libfiles_${CONFIG_TYPE} ${libfile_${CONFIG_TYPE}})
|
|
||||||
endforeach()
|
|
||||||
else()
|
|
||||||
get_target_property(libfile ${lib} LOCATION)
|
|
||||||
list(APPEND libfiles "${libfile}")
|
|
||||||
endif(multiconfig)
|
|
||||||
endforeach()
|
|
||||||
message(STATUS "will be merging ${libfiles}")
|
|
||||||
# Just to be sure: cleanup from duplicates
|
|
||||||
if(multiconfig)
|
|
||||||
foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
|
|
||||||
list(REMOVE_DUPLICATES libfiles_${CONFIG_TYPE})
|
|
||||||
set(libfiles ${libfiles} ${libfiles_${CONFIG_TYPE}})
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
list(REMOVE_DUPLICATES libfiles)
|
|
||||||
|
|
||||||
# Now the easy part for MSVC and for MAC
|
|
||||||
if(MSVC)
|
|
||||||
# lib.exe does the merging of libraries just need to conver the list into string
|
|
||||||
foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
|
|
||||||
set(flags "")
|
|
||||||
foreach(lib ${libfiles_${CONFIG_TYPE}})
|
|
||||||
set(flags "${flags} ${lib}")
|
|
||||||
endforeach()
|
|
||||||
string(TOUPPER "STATIC_LIBRARY_FLAGS_${CONFIG_TYPE}" PROPNAME)
|
|
||||||
set_target_properties(${outlib} PROPERTIES ${PROPNAME} "${flags}")
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
elseif(APPLE)
|
|
||||||
# Use OSX's libtool to merge archives
|
|
||||||
if(multiconfig)
|
|
||||||
message(FATAL_ERROR "Multiple configurations are not supported")
|
|
||||||
endif()
|
|
||||||
get_target_property(outfile ${outlib} LOCATION)
|
|
||||||
add_custom_command(TARGET ${outlib} POST_BUILD
|
|
||||||
COMMAND rm ${outfile}
|
|
||||||
COMMAND /usr/bin/libtool -static -o ${outfile}
|
|
||||||
${libfiles}
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
# general UNIX - need to "ar -x" and then "ar -ru"
|
|
||||||
if(multiconfig)
|
|
||||||
message(FATAL_ERROR "Multiple configurations are not supported")
|
|
||||||
endif()
|
|
||||||
get_target_property(outfile ${outlib} LOCATION)
|
|
||||||
message(STATUS "outfile location is ${outfile}")
|
|
||||||
foreach(lib ${libfiles})
|
|
||||||
# objlistfile will contain the list of object files for the library
|
|
||||||
set(objlistfile ${lib}.objlist)
|
|
||||||
set(objdir ${lib}.objdir)
|
|
||||||
set(objlistcmake ${objlistfile}.cmake)
|
|
||||||
# we only need to extract files once
|
|
||||||
if(${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cmake.check_cache IS_NEWER_THAN ${objlistcmake})
|
|
||||||
#---------------------------------
|
|
||||||
FILE(WRITE ${objlistcmake}
|
|
||||||
"# Extract object files from the library
|
|
||||||
message(STATUS \"Extracting object files from ${lib}\")
|
|
||||||
EXECUTE_PROCESS(COMMAND ${CMAKE_AR} -x ${lib}
|
|
||||||
WORKING_DIRECTORY ${objdir})
|
|
||||||
# save the list of object files
|
|
||||||
EXECUTE_PROCESS(COMMAND ls .
|
|
||||||
OUTPUT_FILE ${objlistfile}
|
|
||||||
WORKING_DIRECTORY ${objdir})")
|
|
||||||
#---------------------------------
|
|
||||||
file(MAKE_DIRECTORY ${objdir})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${objlistfile}
|
|
||||||
COMMAND ${CMAKE_COMMAND} -P ${objlistcmake}
|
|
||||||
DEPENDS ${lib})
|
|
||||||
endif()
|
|
||||||
list(APPEND extrafiles "${objlistfile}")
|
|
||||||
# relative path is needed by ar under MSYS
|
|
||||||
file(RELATIVE_PATH objlistfilerpath ${objdir} ${objlistfile})
|
|
||||||
add_custom_command(TARGET ${outlib} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Running: ${CMAKE_AR} ru ${outfile} @${objlistfilerpath}"
|
|
||||||
COMMAND ${CMAKE_AR} ru "${outfile}" @"${objlistfilerpath}"
|
|
||||||
WORKING_DIRECTORY ${objdir})
|
|
||||||
endforeach()
|
|
||||||
add_custom_command(TARGET ${outlib} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Running: ${CMAKE_RANLIB} ${outfile}"
|
|
||||||
COMMAND ${CMAKE_RANLIB} ${outfile})
|
|
||||||
endif()
|
|
||||||
file(WRITE ${dummyfile}.base "const char* ${outlib}_sublibs=\"${libs}\";")
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${dummyfile}
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${dummyfile}.base ${dummyfile}
|
|
||||||
DEPENDS ${libs} ${extrafiles})
|
|
||||||
|
|
||||||
endfunction()
|
|
||||||
|
|
@ -82,8 +82,13 @@ function (bitmonero_add_library name)
|
||||||
FILES
|
FILES
|
||||||
${ARGN})
|
${ARGN})
|
||||||
|
|
||||||
add_library("${name}"
|
# Define a ("virtual") object library and an actual library that links those
|
||||||
${ARGN})
|
# 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}"
|
set_property(TARGET "${name}"
|
||||||
PROPERTY
|
PROPERTY
|
||||||
FOLDER "libs")
|
FOLDER "libs")
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# 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/libutils.cmake)
|
||||||
include (${PROJECT_SOURCE_DIR}/cmake/MergeStaticLibs.cmake)
|
|
||||||
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
|
||||||
|
|
@ -76,7 +75,11 @@ target_link_libraries(wallet
|
||||||
${EXTRA_LIBRARIES})
|
${EXTRA_LIBRARIES})
|
||||||
|
|
||||||
set(libs_to_merge wallet cryptonote_core mnemonics common crypto)
|
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
|
install(TARGETS wallet_merged
|
||||||
ARCHIVE DESTINATION lib)
|
ARCHIVE DESTINATION lib)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue