From 4f198544f2710a20b994782c1728cd467618040a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 11 Dec 2018 11:41:31 +0900 Subject: [PATCH] Update tflite library name in cmake (#3967) Update tflite library name in cmake to nnfw_lib_tflite Signed-off-by: Hyeongseok Oh --- contrib/tf_test/CMakeLists.txt | 2 +- contrib/tflite_classify/CMakeLists.txt | 2 +- libs/tflite/CMakeLists.txt | 14 +++++++------- tools/nnapi_quickcheck/CMakeLists.txt | 2 +- tools/nnapi_test/CMakeLists.txt | 2 +- tools/tflite_benchmark/CMakeLists.txt | 2 +- tools/tflite_benchmark_model/CMakeLists.txt | 2 +- tools/tflite_examples/CMakeLists.txt | 2 +- tools/tflite_run/CMakeLists.txt | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/tf_test/CMakeLists.txt b/contrib/tf_test/CMakeLists.txt index 406c0bc..11bb205 100644 --- a/contrib/tf_test/CMakeLists.txt +++ b/contrib/tf_test/CMakeLists.txt @@ -11,6 +11,6 @@ endif(NOT Tensorflow_FOUND) list(APPEND SOURCES tf_test.cpp) add_executable(tf_test ${SOURCES}) -target_link_libraries(tf_test PRIVATE nnfw_support_tflite) +target_link_libraries(tf_test PRIVATE nnfw_lib_tflite) target_link_libraries(tf_test PRIVATE tensorflow-lite) target_link_libraries(tf_test PRIVATE tensorflow-core) diff --git a/contrib/tflite_classify/CMakeLists.txt b/contrib/tflite_classify/CMakeLists.txt index b5605f5..3ae4adc 100644 --- a/contrib/tflite_classify/CMakeLists.txt +++ b/contrib/tflite_classify/CMakeLists.txt @@ -15,7 +15,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${ROOTFS_ARM}/usr/lib/ar add_executable(tflite_classify ${SOURCES}) target_include_directories(tflite_classify PRIVATE src) -target_link_libraries(tflite_classify tensorflow-lite ${LIB_PTHREAD} dl nnfw_support_tflite) +target_link_libraries(tflite_classify tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_tflite) target_link_libraries(tflite_classify ${Boost_LIBRARIES}) target_link_libraries(tflite_classify ${OpenCV_LIBRARIES}) diff --git a/libs/tflite/CMakeLists.txt b/libs/tflite/CMakeLists.txt index 3ec71f2..e844d1c 100644 --- a/libs/tflite/CMakeLists.txt +++ b/libs/tflite/CMakeLists.txt @@ -2,11 +2,11 @@ file(GLOB_RECURSE SOURCES "src/*.cpp") file(GLOB_RECURSE TESTS "src/*.test.cpp") list(REMOVE_ITEM SOURCES ${TESTS}) -add_library(nnfw_support_tflite STATIC ${SOURCES}) -set_target_properties(nnfw_support_tflite PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_link_libraries(nnfw_support_tflite tensorflow-lite ${LIB_PTHREAD} dl) -target_link_libraries(nnfw_support_tflite nnfw_lib_misc) +add_library(nnfw_lib_tflite STATIC ${SOURCES}) +set_target_properties(nnfw_lib_tflite PROPERTIES POSITION_INDEPENDENT_CODE ON) +target_include_directories(nnfw_lib_tflite PUBLIC ${NNFW_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include) +target_link_libraries(nnfw_lib_tflite tensorflow-lite ${LIB_PTHREAD} dl) +target_link_libraries(nnfw_lib_tflite nnfw_lib_misc) -add_executable(nnfw_support_tflite_test_TensorView src/TensorView.test.cpp) -target_link_libraries(nnfw_support_tflite_test_TensorView nnfw_support_tflite) +add_executable(nnfw_lib_tflite_test_TensorView src/TensorView.test.cpp) +target_link_libraries(nnfw_lib_tflite_test_TensorView nnfw_lib_tflite) diff --git a/tools/nnapi_quickcheck/CMakeLists.txt b/tools/nnapi_quickcheck/CMakeLists.txt index 68a7927..c88155a 100644 --- a/tools/nnapi_quickcheck/CMakeLists.txt +++ b/tools/nnapi_quickcheck/CMakeLists.txt @@ -9,7 +9,7 @@ list(REMOVE_ITEM NNAPI_QUICKCHECK_LIB_SOURCES ${NNAPI_QUICKCHECK_LIB_TESTS}) add_library(nnapi_quickcheck_common ${NNAPI_QUICKCHECK_LIB_SOURCES}) target_include_directories(nnapi_quickcheck_common PUBLIC "inc") target_link_libraries(nnapi_quickcheck_common nnfw_lib_misc) -target_link_libraries(nnapi_quickcheck_common nnfw_support_tflite) +target_link_libraries(nnapi_quickcheck_common nnfw_lib_tflite) add_executable(nnapi_quickcheck_lib_env_test "lib/env.test.cpp") target_link_libraries(nnapi_quickcheck_lib_env_test nnapi_quickcheck_common) diff --git a/tools/nnapi_test/CMakeLists.txt b/tools/nnapi_test/CMakeLists.txt index cd9f2a5..b52f4f3 100644 --- a/tools/nnapi_test/CMakeLists.txt +++ b/tools/nnapi_test/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND SOURCES "src/nnapi_test.cc") add_executable(nnapi_test ${SOURCES}) -target_link_libraries(nnapi_test nnfw_support_tflite) +target_link_libraries(nnapi_test nnfw_lib_tflite) install(TARGETS nnapi_test DESTINATION bin) diff --git a/tools/tflite_benchmark/CMakeLists.txt b/tools/tflite_benchmark/CMakeLists.txt index 89a93be..56421a2 100644 --- a/tools/tflite_benchmark/CMakeLists.txt +++ b/tools/tflite_benchmark/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND SOURCES "src/tflite_benchmark.cc") add_executable(tflite_benchmark ${SOURCES}) -target_link_libraries(tflite_benchmark nnfw_support_tflite tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_misc) +target_link_libraries(tflite_benchmark nnfw_lib_tflite tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_misc) install(TARGETS tflite_benchmark DESTINATION bin) diff --git a/tools/tflite_benchmark_model/CMakeLists.txt b/tools/tflite_benchmark_model/CMakeLists.txt index 08c73b2..62f0565 100644 --- a/tools/tflite_benchmark_model/CMakeLists.txt +++ b/tools/tflite_benchmark_model/CMakeLists.txt @@ -9,5 +9,5 @@ list(APPEND SOURCES "${TENSORFLOW_LITE_BASE}/tools/benchmark/benchmark_main.cc" add_executable(tflite_benchmark_model ${SOURCES}) target_compile_definitions(tflite_benchmark_model PUBLIC "TFLITE_PROFILING_ENABLED") -target_link_libraries(tflite_benchmark_model tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_misc nnfw_support_tflite) +target_link_libraries(tflite_benchmark_model tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_misc nnfw_lib_tflite) install(TARGETS tflite_benchmark_model DESTINATION bin) diff --git a/tools/tflite_examples/CMakeLists.txt b/tools/tflite_examples/CMakeLists.txt index 5fe3330..463bc55 100644 --- a/tools/tflite_examples/CMakeLists.txt +++ b/tools/tflite_examples/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable(tflite_conv_example "src/conv.cpp") -target_link_libraries(tflite_conv_example tensorflow-lite ${LIB_PTHREAD} dl nnfw_support_tflite) +target_link_libraries(tflite_conv_example tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_tflite) diff --git a/tools/tflite_run/CMakeLists.txt b/tools/tflite_run/CMakeLists.txt index c9f72ac..49d8731 100644 --- a/tools/tflite_run/CMakeLists.txt +++ b/tools/tflite_run/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND TFLITE_RUN_SRCS "src/tensor_loader.cc") add_executable(tflite_run ${TFLITE_RUN_SRCS}) target_include_directories(tflite_run PRIVATE src) -target_link_libraries(tflite_run tensorflow-lite ${LIB_PTHREAD} dl nnfw_support_tflite) +target_link_libraries(tflite_run tensorflow-lite ${LIB_PTHREAD} dl nnfw_lib_tflite) target_link_libraries(tflite_run boost_program_options boost_system boost_filesystem) install(TARGETS tflite_run DESTINATION bin) -- 2.7.4