mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 00:27:52 +08:00
21 lines
740 B
Diff
21 lines
740 B
Diff
|
diff --git a/Config.cmake/mergestaticlibs.cmake b/Config.cmake/mergestaticlibs.cmake
|
||
|
|
index 858a026..67eccb7 100644
|
||
|
|
--- a/Config.cmake/mergestaticlibs.cmake
|
||
|
|
+++ b/Config.cmake/mergestaticlibs.cmake
|
||
|
|
@@ -21,6 +21,15 @@ function(merge_static_libs outlib )
|
||
|
|
file(WRITE ${dummyfile} "const char * dummy = \"${dummyfile}\";")
|
||
|
|
|
||
|
|
add_library(${outlib} STATIC ${dummyfile})
|
||
|
|
+ foreach(lib IN LISTS libs)
|
||
|
|
+ target_sources(${outlib} PRIVATE "$<TARGET_OBJECTS:${lib}>")
|
||
|
|
+ get_target_property(link_libs ${lib} INTERFACE_LINK_LIBRARIES)
|
||
|
|
+ if(link_libs)
|
||
|
|
+ list(REMOVE_ITEM link_libs ${libs})
|
||
|
|
+ target_link_libraries(${outlib} ${link_libs})
|
||
|
|
+ endif()
|
||
|
|
+ endforeach()
|
||
|
|
+ return()
|
||
|
|
|
||
|
|
if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
|
||
|
|
set(multiconfig FALSE)
|