Browse Source

build onnx2ncnn by default

tags/20180427
nihui 8 years ago
parent
commit
addfcbafe0
3 changed files with 13 additions and 12 deletions
  1. +1
    -0
      tools/CMakeLists.txt
  2. +1
    -2
      tools/caffe/CMakeLists.txt
  3. +11
    -10
      tools/onnx/CMakeLists.txt

+ 1
- 0
tools/CMakeLists.txt View File

@@ -1,6 +1,7 @@

add_subdirectory(caffe)
add_subdirectory(mxnet)
add_subdirectory(onnx)

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src)


+ 1
- 2
tools/caffe/CMakeLists.txt View File

@@ -8,6 +8,5 @@ if(PROTOBUF_FOUND)
add_executable(caffe2ncnn caffe2ncnn.cpp ${CAFFE_PROTO_SRCS} ${CAFFE_PROTO_HDRS})
target_link_libraries(caffe2ncnn ${PROTOBUF_LIBRARIES})
else()
MESSAGE(WARNING "Protobuf not found, caffe model convert tools won't build")
message(WARNING "Protobuf not found, caffe model convert tool won't be built")
endif()


+ 11
- 10
tools/onnx/CMakeLists.txt View File

@@ -1,11 +1,12 @@

find_package(Protobuf REQUIRED)

include_directories(${PROTOBUF_INCLUDE_DIR})

include_directories(${CMAKE_CURRENT_BINARY_DIR})
protobuf_generate_cpp(ONNX_PROTO_SRCS ONNX_PROTO_HDRS onnx.proto)

add_executable(onnx2ncnn onnx2ncnn.cpp ${ONNX_PROTO_SRCS} ${ONNX_PROTO_HDRS})

target_link_libraries(onnx2ncnn ${PROTOBUF_LIBRARIES})
find_package(Protobuf)

if(PROTOBUF_FOUND)
include_directories(${PROTOBUF_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
protobuf_generate_cpp(ONNX_PROTO_SRCS ONNX_PROTO_HDRS onnx.proto)
add_executable(onnx2ncnn onnx2ncnn.cpp ${ONNX_PROTO_SRCS} ${ONNX_PROTO_HDRS})
target_link_libraries(onnx2ncnn ${PROTOBUF_LIBRARIES})
else()
message(WARNING "Protobuf not found, onnx model convert tool won't be built")
endif()

Loading…
Cancel
Save