fix build

This commit is contained in:
Tian Jin 2019-12-23 02:09:11 -05:00
parent 238c937f1b
commit 50ea6bed03
2 changed files with 13 additions and 13 deletions

View File

@ -140,15 +140,15 @@ set(MLIRLibs
Threads::Threads)
set(MLIRWholeArchiveLibs
MLIRAffineToStandard
MLIRAffineOps
MLIRLLVMIR
MLIRStandardOps
MLIRStandardToLLVM
MLIRTransforms
MLIRLoopToStandard
MLIRVectorOps
MLIRLoopOps)
${MLIRAffineToStandard}
${MLIRAffineOps}
${MLIRLLVMIR}
${MLIRStandardOps}
${MLIRStandardToLLVM}
${MLIRTransforms}
${MLIRLoopToStandard}
${MLIRVectorOps}
${MLIRLoopOps})
function(whole_archive_link target lib_dir)
get_property(link_flags TARGET ${target} PROPERTY LINK_FLAGS)
@ -156,7 +156,7 @@ function(whole_archive_link target lib_dir)
set(link_flags "${link_flags} -L${lib_dir} ")
foreach(LIB ${ARGN})
string(CONCAT link_flags ${link_flags}
"-Wl,-force_load ${lib_dir}/lib${LIB}.a ")
"-Wl,-force_load,${LIB} ")
endforeach(LIB)
elseif(MSVC)
foreach(LIB ${ARGN})

View File

@ -70,9 +70,9 @@ add_subdirectory(runtime)
add_executable(onnf main.cpp)
target_link_libraries(onnf builder compiler ${MLIRLibs} onnf_transform)
whole_archive_link_mlir(onnf ${MLIRWholeArchiveLibs})
target_link_libraries(onnf builder ${MLIRLibs} onnf_transform)
set_target_properties(onnf PROPERTIES LINK_FLAGS "-lz")
whole_archive_link_mlir(onnf ${MLIRWholeArchiveLibs})
target_include_directories(onnf PRIVATE ${CMAKE_SOURCE_DIR})
target_include_directories(onnf PRIVATE ${CMAKE_BINARY_DIR})