From 93bbb42e7577776be4323509b13a986cb6516ca4 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 7 Mar 2019 10:51:55 -0800 Subject: [PATCH] Change the way of linking dl lib --- cmake/CMakeLists.txt | 2 +- cmake/onnxruntime_common.cmake | 6 ++---- cmake/onnxruntime_unittests.cmake | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c38b77ee82..a8468f172b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -535,7 +535,7 @@ else() if(onnxruntime_USE_NSYNC) list(APPEND onnxruntime_EXTERNAL_LIBRARIES nsync_cpp) endif() - list(APPEND onnxruntime_EXTERNAL_LIBRARIES Threads::Threads) + list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${CMAKE_DL_LIBS} Threads::Threads) set(onnxruntime_EXTERNAL_LIBRARIES_DEBUG ${onnxruntime_EXTERNAL_LIBRARIES}) endif() diff --git a/cmake/onnxruntime_common.cmake b/cmake/onnxruntime_common.cmake index 1ab2242d8d..ccf59247fd 100644 --- a/cmake/onnxruntime_common.cmake +++ b/cmake/onnxruntime_common.cmake @@ -37,11 +37,9 @@ source_group(TREE ${REPO_ROOT} FILES ${onnxruntime_common_src}) add_library(onnxruntime_common ${onnxruntime_common_src}) -if(NOT WIN32) - target_link_libraries(onnxruntime_common dl) -endif() onnxruntime_add_include_to_target(onnxruntime_common gsl date) -target_include_directories(onnxruntime_common PRIVATE ${ONNXRUNTIME_ROOT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/external/nsync/public") +target_include_directories(onnxruntime_common PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT} + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/external/nsync/public") if(onnxruntime_USE_NSYNC) target_compile_definitions(onnxruntime_common PUBLIC USE_NSYNC) endif() diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake index 63aee1e2b3..a5e98881bb 100644 --- a/cmake/onnxruntime_unittests.cmake +++ b/cmake/onnxruntime_unittests.cmake @@ -9,7 +9,6 @@ endif() set(disabled_warnings) set(extra_includes) - function(AddTest) cmake_parse_arguments(_UT "DYN" "TARGET" "LIBS;SOURCES;DEPENDS" ${ARGN}) if(_UT_LIBS) @@ -30,9 +29,10 @@ function(AddTest) add_dependencies(${_UT_TARGET} ${_UT_DEPENDS} eigen) endif(_UT_DEPENDS) if(_UT_DYN) - target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest gmock onnxruntime Threads::Threads) + target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest gmock onnxruntime ${CMAKE_DL_LIBS} Threads::Threads) else() - target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest gmock debug ${onnxruntime_EXTERNAL_LIBRARIES_DEBUG} optimized ${onnxruntime_EXTERNAL_LIBRARIES}) + target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest gmock debug ${onnxruntime_EXTERNAL_LIBRARIES_DEBUG} + optimized ${onnxruntime_EXTERNAL_LIBRARIES}) endif() onnxruntime_add_include_to_target(${_UT_TARGET} gsl eigen) target_include_directories(${_UT_TARGET} PRIVATE ${TEST_INC_DIR})