diff --git a/MLIR.cmake b/MLIR.cmake index 7200493..4cb4b08 100644 --- a/MLIR.cmake +++ b/MLIR.cmake @@ -153,10 +153,10 @@ set(MLIRWholeArchiveLibs function(whole_archive_link target lib_dir) get_property(link_flags TARGET ${target} PROPERTY LINK_FLAGS) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(link_flags "${link_flags} -L${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_dir}/lib${LIB}.a ") endforeach(LIB) elseif(MSVC) foreach(LIB ${ARGN}) @@ -177,9 +177,9 @@ function(whole_archive_link_mlir target) endfunction(whole_archive_link_mlir) function(whole_archive_link_onnf target) - foreach(LIB ${ARGN}) - add_dependencies(${target} ${LIB}) - endforeach(LIB) + foreach(lib_target ${ARGN}) + add_dependencies(${target} ${lib_target}) + endforeach(lib_target) whole_archive_link(${target} ${CMAKE_BINARY_DIR}/lib ${ARGN}) endfunction(whole_archive_link_onnf) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cb0488..ef21d2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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})