Skip to content

Commit d820c9b

Browse files
Pass --build_shared_lib to some QNN pipelines. Include Boost::mp11.
1 parent ea2a141 commit d820c9b

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

cmake/onnxruntime_providers_qnn.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_providers_qnn_cc_srcs})
2121
onnxruntime_add_shared_library_module(onnxruntime_providers_qnn ${onnxruntime_providers_qnn_cc_srcs})
22-
onnxruntime_add_include_to_target(onnxruntime_providers_qnn ${ONNXRUNTIME_PROVIDERS_SHARED} ${GSL_TARGET} onnx onnxruntime_common safeint_interface)
22+
onnxruntime_add_include_to_target(onnxruntime_providers_qnn ${ONNXRUNTIME_PROVIDERS_SHARED} ${GSL_TARGET} onnx onnxruntime_common Boost::mp11 safeint_interface)
2323
target_link_libraries(onnxruntime_providers_qnn PRIVATE ${ONNXRUNTIME_PROVIDERS_SHARED} ${ABSEIL_LIBS})
2424
add_dependencies(onnxruntime_providers_qnn ${onnxruntime_EXTERNAL_DEPENDENCIES})
2525
target_include_directories(onnxruntime_providers_qnn PRIVATE ${ONNXRUNTIME_ROOT}

tools/ci_build/github/azure-pipelines/android-arm64-v8a-QNN-crosscompile-ci-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
--android_abi=x86_64 \
7373
--android_api=31 \
7474
--parallel \
75+
--build_shared_lib \
7576
--use_qnn \
7677
--qnn_home $(QnnSDKRootDir) \
7778
--cmake_generator=Ninja \

tools/ci_build/github/azure-pipelines/linux-qnn-ci-pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
--config Release \
6666
--use_binskim_compliant_compile_flags \
6767
--build_java \
68+
--build_shared_lib \
6869
--use_qnn \
6970
--qnn_home $(QnnSDKRootDir) \
7071
--cmake_generator=Ninja \
@@ -77,6 +78,7 @@ jobs:
7778
--config Release \
7879
--use_binskim_compliant_compile_flags \
7980
--build_java \
81+
--build_shared_lib \
8082
--use_qnn \
8183
--qnn_home $(QnnSDKRootDir) \
8284
--cmake_generator=Ninja \

tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
--config $(BuildConfig)
8080
--build_dir $(Build.BinariesDirectory)
8181
--cmake_generator "Visual Studio 17 2022"
82+
--build_shared_lib
8283
--use_qnn
8384
--qnn_home $(QnnSDKRootDir)
8485
--update --build --parallel
@@ -88,6 +89,7 @@ jobs:
8889
--config $(BuildConfig) ^
8990
--build_dir $(Build.BinariesDirectory) ^
9091
--cmake_generator "Visual Studio 17 2022" ^
92+
--build_shared_lib ^
9193
--use_qnn ^
9294
--qnn_home $(QnnSDKRootDir) ^
9395
--test --enable_onnx_tests

tools/ci_build/github/azure-pipelines/win-qnn-ci-pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
--build_dir $(Build.BinariesDirectory)
7373
--cmake_generator "Visual Studio 17 2022"
7474
--build_java
75+
--build_shared_lib
7576
--use_qnn
7677
--qnn_home $(QnnSDKRootDir)
7778
--use_binskim_compliant_compile_flags
@@ -87,6 +88,7 @@ jobs:
8788
--build_dir $(Build.BinariesDirectory) ^
8889
--cmake_generator "Visual Studio 17 2022" ^
8990
--build_java ^
91+
--build_shared_lib ^
9092
--use_qnn ^
9193
--qnn_home $(QnnSDKRootDir) ^
9294
--use_binskim_compliant_compile_flags ^

0 commit comments

Comments
 (0)