Merge pull request #2679 from gangliao/merge_static

FIX: merge objects to static lib

Merge pull request #2679 from gangliao/merge_static
FIX: merge objects to static lib
efbd380a · gangliao · GitHub · 4a084d04 · a5395216 · efbd380a
显示空白变更内容
内联并排

Showing with 3 addition and 3 deletion

cmake/generic.cmake cmake/generic.cmake +3 -3

未找到文件。
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -147,8 +147,8 @@ function(merge_static_libs TARGET_NAME)

    foreach(lib ${libs})
      add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-      COMMAND ${CMAKE_AR} ru ${outlibfile} @"../${objlistfile}"
-      WORKING_DIRECTORY ${objdir})
+      COMMAND ${CMAKE_AR} ru ${outlibfile} @"../${lib}.objlist"
+      WORKING_DIRECTORY ${lib}.objdir)
    endforeach()

    add_custom_command(TARGET ${TARGET_NAME} POST_BUILD