From ccca1e9402eda5477f2f54d24b4e8b23332f6848 Mon Sep 17 00:00:00 2001 From: jignparm Date: Fri, 25 Jan 2019 10:45:39 -0800 Subject: [PATCH] Update property file for Nuget Linux package (#369) * Copy mkldnn to output folder for linux. Nuget doesn't resolve dll dependency correctly within a package * Modify to copy all dlls to output folder * update rpath for shared library * Simplified linker flags for RPATH * Removing copying of dlls to output folder, since setting RPATH works fine now --- cmake/onnxruntime.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake index bdd86c3aa4..6e9a9c485e 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake @@ -39,6 +39,10 @@ else() set(ONNXRUNTIME_SO_LINK_FLAG "-DEF:${SYMBOL_FILE}") endif() +if (NOT WIN32) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'") +endif() + #The BEGIN_WHOLE_ARCHIVE/END_WHOLE_ARCHIVE part should contain the implementations of all the C API functions target_link_libraries(onnxruntime PRIVATE ${BEGIN_WHOLE_ARCHIVE}