diff options
author | redfish <redfish@galactica.pw> | 2016-08-29 10:58:52 -0400 |
---|---|---|
committer | redfish <redfish@galactica.pw> | 2016-08-30 23:01:48 -0400 |
commit | 1de812a92a1f0b6c9080044e04cb77bc34a2ebe7 (patch) | |
tree | d5ff927722082869d1a8112ada836e7b7cff4ae4 /cmake/MergeStaticLibs.cmake | |
parent | cmake: comply with the new policy CMP0026 (diff) | |
download | monero-1de812a92a1f0b6c9080044e04cb77bc34a2ebe7.tar.xz |
cmake: merge libs via virtual object libraries
CMake issued a warming about policy CMP0026: access of LOCATION
target property at config time was disallowed. Offending code
was the code that merged static libraries to generate
libwallet_merged.a.
This patch does that same merge task in a much simpler way. And,
since it doesn't violate the policy, the warning went away.
Diffstat (limited to '')
-rw-r--r-- | cmake/MergeStaticLibs.cmake | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/cmake/MergeStaticLibs.cmake b/cmake/MergeStaticLibs.cmake deleted file mode 100644 index 1f0cee11a..000000000 --- a/cmake/MergeStaticLibs.cmake +++ /dev/null @@ -1,74 +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) - list(REMOVE_DUPLICATES libs) # just in case - - # 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() - set(libfiles "${libfiles} $<TARGET_FILE:${lib}>") - endforeach() - - if(MSVC) # lib.exe does the merging of given a list - set_target_properties(${outlib} PROPERTIES STATIC_LIBRARY_FLAGS "${libfiles}") - - elseif(APPLE) # Use OSX's libtool to merge archives - add_custom_command(TARGET ${outlib} POST_BUILD - COMMAND rm "$<TARGET_FILE:${outlib}>" - COMMAND /usr/bin/libtool -static -o "$<TARGET_FILE:${outlib}>" ${libfiles}) - - else() # general UNIX: use "ar" to extract objects and re-add to a common lib - foreach(lib ${libs}) - set(objlistfile ${lib}.objlist) # list of objects in the input library - set(objdir ${lib}.objdir) - - add_custom_command(OUTPUT ${objdir} - COMMAND ${CMAKE_COMMAND} -E make_directory ${objdir}) - - add_custom_command(OUTPUT ${objlistfile} - COMMAND ${CMAKE_AR} -x "$<TARGET_FILE:${lib}>" - COMMAND ${CMAKE_AR} -t "$<TARGET_FILE:${lib}>" > ../${objlistfile} - DEPENDS ${lib} ${objdir} - WORKING_DIRECTORY ${objdir}) - - # Empty dummy source file that goes into merged library - set(mergebase ${lib}.mergebase.c) - add_custom_command(OUTPUT ${mergebase} - COMMAND ${CMAKE_COMMAND} -E touch ${mergebase} - DEPENDS ${objlistfile}) - - list(APPEND mergebases "${mergebase}") - endforeach() - - # We need a target for the output merged library - add_library(${outlib} STATIC ${mergebases}) - set(outlibfile "$<TARGET_FILE:${outlib}>") - - foreach(lib ${libs}) - add_custom_command(TARGET ${outlib} POST_BUILD - COMMAND ${CMAKE_AR} ru ${outlibfile} @"../${objlistfile}" - WORKING_DIRECTORY ${objdir}) - endforeach() - - add_custom_command(TARGET ${outlib} POST_BUILD - COMMAND ${CMAKE_RANLIB} ${outlibfile}) - endif() -endfunction() |