mirror of https://github.com/microsoft/vcpkg.git
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 710288a8..91d5579b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -10,6 +10,9 @@ project(onnx_optimizer C CXX)
|
|
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
|
|
+function(add_msvc_runtime_flag lib)
|
|
+endfunction()
|
|
+
|
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
|
|
include(cmake/utils.cmake)
|
|
@@ -27,12 +30,10 @@ option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF)
|
|
if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
|
|
option(protobuf_BUILD_TESTS "" OFF)
|
|
option(protobuf_MSVC_STATIC_RUNTIME "" ${ONNX_USE_MSVC_STATIC_RUNTIME})
|
|
- add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf libprotobuf)
|
|
endif()
|
|
|
|
-
|
|
-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
|
|
-add_subdirectory_if_no_target(${ONNX_ROOT} ${ONNX_TARGET_NAME})
|
|
+find_package(protobuf CONFIG REQUIRED)
|
|
+find_package(ONNX CONFIG REQUIRED)
|
|
|
|
file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
|
|
string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
|
|
@@ -45,7 +46,7 @@ file(GLOB onnx_opt_srcs CONFIGURE_DEPENDS "onnxoptimizer/*.cc"
|
|
list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc")
|
|
|
|
onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs})
|
|
-target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME})
|
|
+target_link_libraries(onnx_optimizer PUBLIC ONNX::onnx ONNX::onnx_proto)
|
|
target_include_directories(onnx_optimizer PUBLIC
|
|
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
|
|
$<INSTALL_INTERFACE:include>
|
|
diff --git a/cmake/ONNXOptimizerConfig.cmake.in b/cmake/ONNXOptimizerConfig.cmake.in
|
|
index 72dcc88d..2af23cba 100644
|
|
--- a/cmake/ONNXOptimizerConfig.cmake.in
|
|
+++ b/cmake/ONNXOptimizerConfig.cmake.in
|
|
@@ -3,6 +3,10 @@
|
|
# ONNX_OPTIMIZER_INCLUDE_DIRS - include directories for onnx optimizer
|
|
# as well as ONNX Optimizer targets for other cmake libraries to use.
|
|
|
|
+include(CMakeFindDependencyMacro)
|
|
+find_dependency(protobuf CONFIG)
|
|
+find_dependency(ONNX CONFIG)
|
|
+
|
|
# library version information
|
|
set(ONNX_OPTIMIZER_VERSION "@ONNX_OPTIMIZER_VERSION@")
|
|
|
|
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
|
|
index 075f55f5..d351cd6f 100644
|
|
--- a/cmake/utils.cmake
|
|
+++ b/cmake/utils.cmake
|
|
@@ -2,8 +2,6 @@
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
|
|
-
|
|
# Poor man's FetchContent
|
|
function(add_subdirectory_if_no_target dir target)
|
|
if (NOT TARGET ${target})
|