From 02f4fb63f69a4078ab7803850009efd64318d304 Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Thu, 8 May 2025 11:56:47 +0900 Subject: [PATCH] [infra/onert] Remove versioning in cmake config This commit removes multiple cmake package version files in onert build dependency. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh --- .../FlatBuffers-2.0/FlatBuffersConfig.cmake | 35 ------------------- .../FlatBuffersConfigVersion.cmake | 10 ------ .../FlatBuffersConfig.cmake | 0 .../FlatBuffersConfigVersion.cmake | 0 .../TRIXEngineConfigVersion.extra.cpp | 0 .../TRIXEngineConfigVersion.major.cpp | 0 .../TRIXEngineConfigVersion.minor.cpp | 0 .../packages/TRIXEngineConfigVersion.cmake | 6 ++-- .../TensorFlowLite/CMakeLists.txt | 0 .../TensorFlowLiteConfig.cmake | 0 .../TensorFlowLiteConfigVersion.cmake | 0 11 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfig.cmake delete mode 100644 infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfigVersion.cmake rename infra/nnfw/cmake/packages/{FlatBuffers-23.5.26 => }/FlatBuffersConfig.cmake (100%) rename infra/nnfw/cmake/packages/{FlatBuffers-23.5.26 => }/FlatBuffersConfigVersion.cmake (100%) rename infra/nnfw/cmake/packages/{ => TRIXEngine}/TRIXEngineConfigVersion.extra.cpp (100%) rename infra/nnfw/cmake/packages/{ => TRIXEngine}/TRIXEngineConfigVersion.major.cpp (100%) rename infra/nnfw/cmake/packages/{ => TRIXEngine}/TRIXEngineConfigVersion.minor.cpp (100%) rename infra/nnfw/cmake/packages/{TensorFlowLite-2.16.1 => }/TensorFlowLite/CMakeLists.txt (100%) rename infra/nnfw/cmake/packages/{TensorFlowLite-2.16.1 => }/TensorFlowLiteConfig.cmake (100%) rename infra/nnfw/cmake/packages/{TensorFlowLite-2.16.1 => }/TensorFlowLiteConfigVersion.cmake (100%) diff --git a/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfig.cmake b/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfig.cmake deleted file mode 100644 index 032724ae2a4..00000000000 --- a/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfig.cmake +++ /dev/null @@ -1,35 +0,0 @@ -function(_FlatBuffers_import) - - find_package(Flatbuffers QUIET) - if(Flatbuffers_FOUND) - set(FlatBuffers_FOUND TRUE PARENT_SCOPE) - return() - endif(Flatbuffers_FOUND) - - # NOTE Tizen uses 2.0 - nnas_find_package(FlatBuffersSource EXACT 2.0 QUIET) - - if(NOT FlatBuffersSource_FOUND) - set(FlatBuffers_FOUND FALSE PARENT_SCOPE) - return() - endif(NOT FlatBuffersSource_FOUND) - - # From FlatBuffers's CMakeLists.txt - list(APPEND FlatBuffers_Library_SRCS "${FlatBuffersSource_DIR}/src/code_generators.cpp") - list(APPEND FlatBuffers_Library_SRCS "${FlatBuffersSource_DIR}/src/idl_parser.cpp") - list(APPEND FlatBuffers_Library_SRCS "${FlatBuffersSource_DIR}/src/idl_gen_text.cpp") - list(APPEND FlatBuffers_Library_SRCS "${FlatBuffersSource_DIR}/src/reflection.cpp") - list(APPEND FlatBuffers_Library_SRCS "${FlatBuffersSource_DIR}/src/util.cpp") - - if(NOT TARGET flatbuffers::flatbuffers) - add_library(flatbuffers ${FlatBuffers_Library_SRCS}) - target_include_directories(flatbuffers PUBLIC "${FlatBuffersSource_DIR}/include") - set_property(TARGET flatbuffers PROPERTY POSITION_INDEPENDENT_CODE ON) - - add_library(flatbuffers::flatbuffers ALIAS flatbuffers) - endif(NOT TARGET flatbuffers::flatbuffers) - - set(FlatBuffers_FOUND TRUE PARENT_SCOPE) -endfunction(_FlatBuffers_import) - -_FlatBuffers_import() diff --git a/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfigVersion.cmake b/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfigVersion.cmake deleted file mode 100644 index e4a87a7d540..00000000000 --- a/infra/nnfw/cmake/packages/FlatBuffers-2.0/FlatBuffersConfigVersion.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(PACKAGE_VERSION "2.0") -set(PACKAGE_VERSION_EXACT FALSE) -set(PACKAGE_VERSION_COMPATIBLE FALSE) -set(PACKAGE_VERSION_UNSUITABLE TRUE) - -if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) - set(PACKAGE_VERSION_COMPATIBLE TRUE) - set(PACKAGE_VERSION_UNSUITABLE FALSE) -endif(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) diff --git a/infra/nnfw/cmake/packages/FlatBuffers-23.5.26/FlatBuffersConfig.cmake b/infra/nnfw/cmake/packages/FlatBuffersConfig.cmake similarity index 100% rename from infra/nnfw/cmake/packages/FlatBuffers-23.5.26/FlatBuffersConfig.cmake rename to infra/nnfw/cmake/packages/FlatBuffersConfig.cmake diff --git a/infra/nnfw/cmake/packages/FlatBuffers-23.5.26/FlatBuffersConfigVersion.cmake b/infra/nnfw/cmake/packages/FlatBuffersConfigVersion.cmake similarity index 100% rename from infra/nnfw/cmake/packages/FlatBuffers-23.5.26/FlatBuffersConfigVersion.cmake rename to infra/nnfw/cmake/packages/FlatBuffersConfigVersion.cmake diff --git a/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.extra.cpp b/infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.extra.cpp similarity index 100% rename from infra/nnfw/cmake/packages/TRIXEngineConfigVersion.extra.cpp rename to infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.extra.cpp diff --git a/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.major.cpp b/infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.major.cpp similarity index 100% rename from infra/nnfw/cmake/packages/TRIXEngineConfigVersion.major.cpp rename to infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.major.cpp diff --git a/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.minor.cpp b/infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.minor.cpp similarity index 100% rename from infra/nnfw/cmake/packages/TRIXEngineConfigVersion.minor.cpp rename to infra/nnfw/cmake/packages/TRIXEngine/TRIXEngineConfigVersion.minor.cpp diff --git a/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.cmake b/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.cmake index 5ede1fb96e0..aba8ca5ba68 100644 --- a/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.cmake +++ b/infra/nnfw/cmake/packages/TRIXEngineConfigVersion.cmake @@ -46,7 +46,7 @@ set(TRYRUN_COMPILE_DEFINITIONS "-I${TRIXEngine_INCLUDE_DIR} -I${NPUBINFMT_INCLUD # TODO Can we run this only once per configure? try_run(MAJOR_VER MAJOR_COMPILABLE "${CMAKE_BINARY_DIR}/TRIXEngineConfigVersion.major" - SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngineConfigVersion.major.cpp" + SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngine/TRIXEngineConfigVersion.major.cpp" COMPILE_DEFINITIONS "${TRYRUN_COMPILE_DEFINITIONS}" LINK_LIBRARIES ${TRIXEngine_LIB} ) @@ -67,13 +67,13 @@ if(NOT MAJOR_COMPILABLE) endif(NOT MAJOR_COMPILABLE) try_run(MINOR_VER MINOR_COMPILABLE "${CMAKE_BINARY_DIR}/TRIXEngineConfigVersion.minor" - SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngineConfigVersion.minor.cpp" + SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngine/TRIXEngineConfigVersion.minor.cpp" COMPILE_DEFINITIONS "${TRYRUN_COMPILE_DEFINITIONS}" LINK_LIBRARIES ${TRIXEngine_LIB} ) try_run(EXTRA_VER EXTRA_COMPILABLE "${CMAKE_BINARY_DIR}/TRIXEngineConfigVersion.extra" - SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngineConfigVersion.extra.cpp" + SOURCES "${CMAKE_CURRENT_LIST_DIR}/TRIXEngine/TRIXEngineConfigVersion.extra.cpp" COMPILE_DEFINITIONS "${TRYRUN_COMPILE_DEFINITIONS}" LINK_LIBRARIES ${TRIXEngine_LIB} ) diff --git a/infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLite/CMakeLists.txt b/infra/nnfw/cmake/packages/TensorFlowLite/CMakeLists.txt similarity index 100% rename from infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLite/CMakeLists.txt rename to infra/nnfw/cmake/packages/TensorFlowLite/CMakeLists.txt diff --git a/infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLiteConfig.cmake b/infra/nnfw/cmake/packages/TensorFlowLiteConfig.cmake similarity index 100% rename from infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLiteConfig.cmake rename to infra/nnfw/cmake/packages/TensorFlowLiteConfig.cmake diff --git a/infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLiteConfigVersion.cmake b/infra/nnfw/cmake/packages/TensorFlowLiteConfigVersion.cmake similarity index 100% rename from infra/nnfw/cmake/packages/TensorFlowLite-2.16.1/TensorFlowLiteConfigVersion.cmake rename to infra/nnfw/cmake/packages/TensorFlowLiteConfigVersion.cmake