From 45c33d3ed504df91975e44c0742971899d304f01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 16 Jul 2019 18:21:47 +0900 Subject: [PATCH] Move cmake directory (#5648) * Move cmake directory Move cmake script directory to infra/nnfw/cmake Move root CMakeLists.txt to infra/nnfw Signed-off-by: Hyeongseok Oh * Define NNFW_SOURCE_ROOT and use --- CMakeLists.txt => infra/nnfw/CMakeLists.txt | 16 +++++++++------- {cmake => infra/nnfw/cmake}/ApplyCompileFlags.cmake | 0 {cmake => infra/nnfw/cmake}/CfgOptionFlags.cmake | 0 .../cmake}/buildtool/config/config_aarch64-linux.cmake | 0 .../cmake}/buildtool/config/config_aarch64-tizen.cmake | 0 .../cmake}/buildtool/config/config_arm64-android.cmake | 0 .../cmake}/buildtool/config/config_armv7l-linux.cmake | 0 .../cmake}/buildtool/config/config_armv7l-tizen.cmake | 0 .../nnfw/cmake}/buildtool/config/config_linux.cmake | 0 .../cmake}/buildtool/config/config_x86_64-linux.cmake | 0 .../cmake}/buildtool/cross/toolchain_aarch64-linux.cmake | 4 ++-- .../cmake}/buildtool/cross/toolchain_aarch64-tizen.cmake | 4 ++-- .../cmake}/buildtool/cross/toolchain_arm64-android.cmake | 0 .../cmake}/buildtool/cross/toolchain_armv7l-linux.cmake | 2 +- .../cmake}/buildtool/cross/toolchain_armv7l-tizen.cmake | 4 ++-- .../nnfw/cmake}/modules/ExtendCMakeFunction.cmake | 0 .../nnfw/cmake}/modules/ExternalProjectTools.cmake | 0 .../nnfw/cmake}/modules/ExternalSourceTools.cmake | 0 .../nnfw/cmake}/modules/IdentifyPlatform.cmake | 0 {cmake => infra/nnfw/cmake}/modules/OptionTools.cmake | 0 .../nnfw/cmake}/options/options_aarch64-linux.cmake | 0 .../nnfw/cmake}/options/options_aarch64-tizen.cmake | 0 .../nnfw/cmake}/options/options_arm64-android.cmake | 0 .../nnfw/cmake}/options/options_armv7l-linux.cmake | 0 .../nnfw/cmake}/options/options_armv7l-tizen.cmake | 0 .../nnfw/cmake}/options/options_x86_64-linux.cmake | 0 .../nnfw/cmake}/packages/ARMCompute/SConstruct | 0 .../nnfw/cmake}/packages/ARMComputeConfig.cmake | 0 .../nnfw/cmake}/packages/ARMComputeSourceConfig.cmake | 0 .../nnfw/cmake}/packages/AbslSourceConfig.cmake | 0 {cmake => infra/nnfw/cmake}/packages/BoostConfig.cmake | 0 .../nnfw/cmake}/packages/BoostSourceConfig.cmake | 0 .../nnfw/cmake}/packages/CpuinfoSourceConfig.cmake | 0 {cmake => infra/nnfw/cmake}/packages/EigenConfig.cmake | 0 .../nnfw/cmake}/packages/EigenSourceConfig.cmake | 0 .../nnfw/cmake}/packages/Enum34SourceConfig.cmake | 0 .../nnfw/cmake}/packages/FP16SourceConfig.cmake | 0 .../nnfw/cmake}/packages/FXdivSourceConfig.cmake | 0 .../nnfw/cmake}/packages/FarmhashSourceConfig.cmake | 0 .../nnfw/cmake}/packages/FlatBuffersConfig.cmake | 0 .../nnfw/cmake}/packages/FlatBuffersSourceConfig.cmake | 0 .../nnfw/cmake}/packages/GEMMLowpSourceConfig.cmake | 0 {cmake => infra/nnfw/cmake}/packages/GTestConfig.cmake | 0 .../nnfw/cmake}/packages/NEON2SSESourceConfig.cmake | 0 {cmake => infra/nnfw/cmake}/packages/NNPACKConfig.cmake | 0 .../nnfw/cmake}/packages/NNPACKSourceConfig.cmake | 0 .../cmake}/packages/Nonius/html_report_template.g.h++ | 0 {cmake => infra/nnfw/cmake}/packages/NoniusConfig.cmake | 0 .../nnfw/cmake}/packages/NoniusSourceConfig.cmake | 0 .../nnfw/cmake}/packages/OpcodesSourceConfig.cmake | 0 .../nnfw/cmake}/packages/PSIMDSourceConfig.cmake | 0 .../nnfw/cmake}/packages/PeachpySourceConfig.cmake | 0 .../nnfw/cmake}/packages/PthreadpoolSourceConfig.cmake | 0 .../nnfw/cmake}/packages/SixSourceConfig.cmake | 0 .../nnfw/cmake}/packages/TensorFlowLite/CMakeLists.txt | 0 .../nnfw/cmake}/packages/TensorFlowLiteConfig.cmake | 0 .../nnfw/cmake}/packages/TensorFlowSourceConfig.cmake | 0 .../nnfw/cmake}/packages/TensorflowConfig.cmake | 0 scripts/command/configure | 2 +- 59 files changed, 17 insertions(+), 15 deletions(-) rename CMakeLists.txt => infra/nnfw/CMakeLists.txt (85%) rename {cmake => infra/nnfw/cmake}/ApplyCompileFlags.cmake (100%) rename {cmake => infra/nnfw/cmake}/CfgOptionFlags.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_aarch64-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_aarch64-tizen.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_arm64-android.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_armv7l-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_armv7l-tizen.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/config/config_x86_64-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/cross/toolchain_aarch64-linux.cmake (89%) rename {cmake => infra/nnfw/cmake}/buildtool/cross/toolchain_aarch64-tizen.cmake (94%) rename {cmake => infra/nnfw/cmake}/buildtool/cross/toolchain_arm64-android.cmake (100%) rename {cmake => infra/nnfw/cmake}/buildtool/cross/toolchain_armv7l-linux.cmake (93%) rename {cmake => infra/nnfw/cmake}/buildtool/cross/toolchain_armv7l-tizen.cmake (95%) rename {cmake => infra/nnfw/cmake}/modules/ExtendCMakeFunction.cmake (100%) rename {cmake => infra/nnfw/cmake}/modules/ExternalProjectTools.cmake (100%) rename {cmake => infra/nnfw/cmake}/modules/ExternalSourceTools.cmake (100%) rename {cmake => infra/nnfw/cmake}/modules/IdentifyPlatform.cmake (100%) rename {cmake => infra/nnfw/cmake}/modules/OptionTools.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_aarch64-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_aarch64-tizen.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_arm64-android.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_armv7l-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_armv7l-tizen.cmake (100%) rename {cmake => infra/nnfw/cmake}/options/options_x86_64-linux.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/ARMCompute/SConstruct (100%) rename {cmake => infra/nnfw/cmake}/packages/ARMComputeConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/ARMComputeSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/AbslSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/BoostConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/BoostSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/CpuinfoSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/EigenConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/EigenSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/Enum34SourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/FP16SourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/FXdivSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/FarmhashSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/FlatBuffersConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/FlatBuffersSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/GEMMLowpSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/GTestConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/NEON2SSESourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/NNPACKConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/NNPACKSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/Nonius/html_report_template.g.h++ (100%) rename {cmake => infra/nnfw/cmake}/packages/NoniusConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/NoniusSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/OpcodesSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/PSIMDSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/PeachpySourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/PthreadpoolSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/SixSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/TensorFlowLite/CMakeLists.txt (100%) rename {cmake => infra/nnfw/cmake}/packages/TensorFlowLiteConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/TensorFlowSourceConfig.cmake (100%) rename {cmake => infra/nnfw/cmake}/packages/TensorflowConfig.cmake (100%) diff --git a/CMakeLists.txt b/infra/nnfw/CMakeLists.txt similarity index 85% rename from CMakeLists.txt rename to infra/nnfw/CMakeLists.txt index 05a3ca4..1afc5bc 100644 --- a/CMakeLists.txt +++ b/infra/nnfw/CMakeLists.txt @@ -5,7 +5,7 @@ project(nnfw) enable_testing() set(NNFW_EXTERNALS_DIR - "${CMAKE_CURRENT_LIST_DIR}/externals" CACHE + "${CMAKE_CURRENT_LIST_DIR}/../../externals" CACHE INTERNAL "Where to download external dependencies" ) set(NNFW_OVERLAY_DIR "${CMAKE_BINARY_DIR}/overlay" CACHE @@ -59,8 +59,10 @@ nnfw_find_package(GTest QUIET) nnfw_include(ExtendCMakeFunction) +set(NNFW_SOURCE_ROOT "${CMAKE_SOURCE_DIR}/../..") + add_library(nnapi-header INTERFACE) -target_include_directories(nnapi-header INTERFACE include) +target_include_directories(nnapi-header INTERFACE ${NNFW_SOURCE_ROOT}/include) # TODO Support android build via fine-control for each component # - Introduce BUILD_CONTRIB option @@ -75,8 +77,8 @@ target_include_directories(nnapi-header INTERFACE include) # # add_subdirectory(runtimes) -add_subdirectory(contrib) -add_subdirectory(libs) -add_subdirectory(runtimes) -add_subdirectory(tests) -add_subdirectory(tools) +add_subdirectory(${NNFW_SOURCE_ROOT}/contrib conrtib) +add_subdirectory(${NNFW_SOURCE_ROOT}/libs libs) +add_subdirectory(${NNFW_SOURCE_ROOT}/runtimes runtimes) +add_subdirectory(${NNFW_SOURCE_ROOT}/tests tests) +add_subdirectory(${NNFW_SOURCE_ROOT}/tools tools) diff --git a/cmake/ApplyCompileFlags.cmake b/infra/nnfw/cmake/ApplyCompileFlags.cmake similarity index 100% rename from cmake/ApplyCompileFlags.cmake rename to infra/nnfw/cmake/ApplyCompileFlags.cmake diff --git a/cmake/CfgOptionFlags.cmake b/infra/nnfw/cmake/CfgOptionFlags.cmake similarity index 100% rename from cmake/CfgOptionFlags.cmake rename to infra/nnfw/cmake/CfgOptionFlags.cmake diff --git a/cmake/buildtool/config/config_aarch64-linux.cmake b/infra/nnfw/cmake/buildtool/config/config_aarch64-linux.cmake similarity index 100% rename from cmake/buildtool/config/config_aarch64-linux.cmake rename to infra/nnfw/cmake/buildtool/config/config_aarch64-linux.cmake diff --git a/cmake/buildtool/config/config_aarch64-tizen.cmake b/infra/nnfw/cmake/buildtool/config/config_aarch64-tizen.cmake similarity index 100% rename from cmake/buildtool/config/config_aarch64-tizen.cmake rename to infra/nnfw/cmake/buildtool/config/config_aarch64-tizen.cmake diff --git a/cmake/buildtool/config/config_arm64-android.cmake b/infra/nnfw/cmake/buildtool/config/config_arm64-android.cmake similarity index 100% rename from cmake/buildtool/config/config_arm64-android.cmake rename to infra/nnfw/cmake/buildtool/config/config_arm64-android.cmake diff --git a/cmake/buildtool/config/config_armv7l-linux.cmake b/infra/nnfw/cmake/buildtool/config/config_armv7l-linux.cmake similarity index 100% rename from cmake/buildtool/config/config_armv7l-linux.cmake rename to infra/nnfw/cmake/buildtool/config/config_armv7l-linux.cmake diff --git a/cmake/buildtool/config/config_armv7l-tizen.cmake b/infra/nnfw/cmake/buildtool/config/config_armv7l-tizen.cmake similarity index 100% rename from cmake/buildtool/config/config_armv7l-tizen.cmake rename to infra/nnfw/cmake/buildtool/config/config_armv7l-tizen.cmake diff --git a/cmake/buildtool/config/config_linux.cmake b/infra/nnfw/cmake/buildtool/config/config_linux.cmake similarity index 100% rename from cmake/buildtool/config/config_linux.cmake rename to infra/nnfw/cmake/buildtool/config/config_linux.cmake diff --git a/cmake/buildtool/config/config_x86_64-linux.cmake b/infra/nnfw/cmake/buildtool/config/config_x86_64-linux.cmake similarity index 100% rename from cmake/buildtool/config/config_x86_64-linux.cmake rename to infra/nnfw/cmake/buildtool/config/config_x86_64-linux.cmake diff --git a/cmake/buildtool/cross/toolchain_aarch64-linux.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake similarity index 89% rename from cmake/buildtool/cross/toolchain_aarch64-linux.cmake rename to infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake index 86169af..2d1a08d 100644 --- a/cmake/buildtool/cross/toolchain_aarch64-linux.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake @@ -10,9 +10,9 @@ set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) # where is the target environment -set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../..") +set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../../../..") set(ROOTFS_AARCH64 "${NNFW_SOURCE_ROOT}/tools/cross/rootfs/arm64") -include("${NNFW_SOURCE_ROOT}/cmake/modules/OptionTools.cmake") +include("${NNFW_SOURCE_ROOT}/infra/nnfw/cmake/modules/OptionTools.cmake") envoption(ROOTFS_DIR ${ROOTFS_AARCH64}) if(NOT EXISTS "${ROOTFS_DIR}/lib/aarch64-linux-gnu") diff --git a/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake similarity index 94% rename from cmake/buildtool/cross/toolchain_aarch64-tizen.cmake rename to infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake index c521d16..9e1cf3b 100644 --- a/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake @@ -12,9 +12,9 @@ set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++-5) set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/6.2.1") # where is the target environment -set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../..") +set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../../../..") set(ROOTFS_AARCH64 "${NNFW_SOURCE_ROOT}/tools/cross/rootfs/arm64") -include("${NNFW_SOURCE_ROOT}/cmake/modules/OptionTools.cmake") +include("${NNFW_SOURCE_ROOT}/infra/nnfw/cmake/modules/OptionTools.cmake") envoption(ROOTFS_DIR ${ROOTFS_AARCH64}) if(NOT EXISTS "${ROOTFS_DIR}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") diff --git a/cmake/buildtool/cross/toolchain_arm64-android.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake similarity index 100% rename from cmake/buildtool/cross/toolchain_arm64-android.cmake rename to infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake diff --git a/cmake/buildtool/cross/toolchain_armv7l-linux.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake similarity index 93% rename from cmake/buildtool/cross/toolchain_armv7l-linux.cmake rename to infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake index b9966eb..8e36198 100644 --- a/cmake/buildtool/cross/toolchain_armv7l-linux.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake @@ -11,7 +11,7 @@ set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) # where is the target environment -set(ROOTFS_ARM "${CMAKE_CURRENT_LIST_DIR}/../../../tools/cross/rootfs/arm") +set(ROOTFS_ARM "${CMAKE_CURRENT_LIST_DIR}/../../../../../tools/cross/rootfs/arm") envoption(ROOTFS_DIR ${ROOTFS_ARM}) if(NOT EXISTS "${ROOTFS_DIR}/lib/arm-linux-gnueabihf") diff --git a/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake similarity index 95% rename from cmake/buildtool/cross/toolchain_armv7l-tizen.cmake rename to infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake index fd059c7..eb8e638 100644 --- a/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake @@ -12,9 +12,9 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++) set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") # where is the target environment -set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../..") +set(NNFW_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../../../..") set(ROOTFS_ARM "${NNFW_SOURCE_ROOT}/tools/cross/rootfs/armel") -include("${NNFW_SOURCE_ROOT}/cmake/modules/OptionTools.cmake") +include("${NNFW_SOURCE_ROOT}/infra/nnfw/cmake/modules/OptionTools.cmake") envoption(ROOTFS_DIR ${ROOTFS_ARM}) if(NOT EXISTS "${ROOTFS_DIR}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") diff --git a/cmake/modules/ExtendCMakeFunction.cmake b/infra/nnfw/cmake/modules/ExtendCMakeFunction.cmake similarity index 100% rename from cmake/modules/ExtendCMakeFunction.cmake rename to infra/nnfw/cmake/modules/ExtendCMakeFunction.cmake diff --git a/cmake/modules/ExternalProjectTools.cmake b/infra/nnfw/cmake/modules/ExternalProjectTools.cmake similarity index 100% rename from cmake/modules/ExternalProjectTools.cmake rename to infra/nnfw/cmake/modules/ExternalProjectTools.cmake diff --git a/cmake/modules/ExternalSourceTools.cmake b/infra/nnfw/cmake/modules/ExternalSourceTools.cmake similarity index 100% rename from cmake/modules/ExternalSourceTools.cmake rename to infra/nnfw/cmake/modules/ExternalSourceTools.cmake diff --git a/cmake/modules/IdentifyPlatform.cmake b/infra/nnfw/cmake/modules/IdentifyPlatform.cmake similarity index 100% rename from cmake/modules/IdentifyPlatform.cmake rename to infra/nnfw/cmake/modules/IdentifyPlatform.cmake diff --git a/cmake/modules/OptionTools.cmake b/infra/nnfw/cmake/modules/OptionTools.cmake similarity index 100% rename from cmake/modules/OptionTools.cmake rename to infra/nnfw/cmake/modules/OptionTools.cmake diff --git a/cmake/options/options_aarch64-linux.cmake b/infra/nnfw/cmake/options/options_aarch64-linux.cmake similarity index 100% rename from cmake/options/options_aarch64-linux.cmake rename to infra/nnfw/cmake/options/options_aarch64-linux.cmake diff --git a/cmake/options/options_aarch64-tizen.cmake b/infra/nnfw/cmake/options/options_aarch64-tizen.cmake similarity index 100% rename from cmake/options/options_aarch64-tizen.cmake rename to infra/nnfw/cmake/options/options_aarch64-tizen.cmake diff --git a/cmake/options/options_arm64-android.cmake b/infra/nnfw/cmake/options/options_arm64-android.cmake similarity index 100% rename from cmake/options/options_arm64-android.cmake rename to infra/nnfw/cmake/options/options_arm64-android.cmake diff --git a/cmake/options/options_armv7l-linux.cmake b/infra/nnfw/cmake/options/options_armv7l-linux.cmake similarity index 100% rename from cmake/options/options_armv7l-linux.cmake rename to infra/nnfw/cmake/options/options_armv7l-linux.cmake diff --git a/cmake/options/options_armv7l-tizen.cmake b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake similarity index 100% rename from cmake/options/options_armv7l-tizen.cmake rename to infra/nnfw/cmake/options/options_armv7l-tizen.cmake diff --git a/cmake/options/options_x86_64-linux.cmake b/infra/nnfw/cmake/options/options_x86_64-linux.cmake similarity index 100% rename from cmake/options/options_x86_64-linux.cmake rename to infra/nnfw/cmake/options/options_x86_64-linux.cmake diff --git a/cmake/packages/ARMCompute/SConstruct b/infra/nnfw/cmake/packages/ARMCompute/SConstruct similarity index 100% rename from cmake/packages/ARMCompute/SConstruct rename to infra/nnfw/cmake/packages/ARMCompute/SConstruct diff --git a/cmake/packages/ARMComputeConfig.cmake b/infra/nnfw/cmake/packages/ARMComputeConfig.cmake similarity index 100% rename from cmake/packages/ARMComputeConfig.cmake rename to infra/nnfw/cmake/packages/ARMComputeConfig.cmake diff --git a/cmake/packages/ARMComputeSourceConfig.cmake b/infra/nnfw/cmake/packages/ARMComputeSourceConfig.cmake similarity index 100% rename from cmake/packages/ARMComputeSourceConfig.cmake rename to infra/nnfw/cmake/packages/ARMComputeSourceConfig.cmake diff --git a/cmake/packages/AbslSourceConfig.cmake b/infra/nnfw/cmake/packages/AbslSourceConfig.cmake similarity index 100% rename from cmake/packages/AbslSourceConfig.cmake rename to infra/nnfw/cmake/packages/AbslSourceConfig.cmake diff --git a/cmake/packages/BoostConfig.cmake b/infra/nnfw/cmake/packages/BoostConfig.cmake similarity index 100% rename from cmake/packages/BoostConfig.cmake rename to infra/nnfw/cmake/packages/BoostConfig.cmake diff --git a/cmake/packages/BoostSourceConfig.cmake b/infra/nnfw/cmake/packages/BoostSourceConfig.cmake similarity index 100% rename from cmake/packages/BoostSourceConfig.cmake rename to infra/nnfw/cmake/packages/BoostSourceConfig.cmake diff --git a/cmake/packages/CpuinfoSourceConfig.cmake b/infra/nnfw/cmake/packages/CpuinfoSourceConfig.cmake similarity index 100% rename from cmake/packages/CpuinfoSourceConfig.cmake rename to infra/nnfw/cmake/packages/CpuinfoSourceConfig.cmake diff --git a/cmake/packages/EigenConfig.cmake b/infra/nnfw/cmake/packages/EigenConfig.cmake similarity index 100% rename from cmake/packages/EigenConfig.cmake rename to infra/nnfw/cmake/packages/EigenConfig.cmake diff --git a/cmake/packages/EigenSourceConfig.cmake b/infra/nnfw/cmake/packages/EigenSourceConfig.cmake similarity index 100% rename from cmake/packages/EigenSourceConfig.cmake rename to infra/nnfw/cmake/packages/EigenSourceConfig.cmake diff --git a/cmake/packages/Enum34SourceConfig.cmake b/infra/nnfw/cmake/packages/Enum34SourceConfig.cmake similarity index 100% rename from cmake/packages/Enum34SourceConfig.cmake rename to infra/nnfw/cmake/packages/Enum34SourceConfig.cmake diff --git a/cmake/packages/FP16SourceConfig.cmake b/infra/nnfw/cmake/packages/FP16SourceConfig.cmake similarity index 100% rename from cmake/packages/FP16SourceConfig.cmake rename to infra/nnfw/cmake/packages/FP16SourceConfig.cmake diff --git a/cmake/packages/FXdivSourceConfig.cmake b/infra/nnfw/cmake/packages/FXdivSourceConfig.cmake similarity index 100% rename from cmake/packages/FXdivSourceConfig.cmake rename to infra/nnfw/cmake/packages/FXdivSourceConfig.cmake diff --git a/cmake/packages/FarmhashSourceConfig.cmake b/infra/nnfw/cmake/packages/FarmhashSourceConfig.cmake similarity index 100% rename from cmake/packages/FarmhashSourceConfig.cmake rename to infra/nnfw/cmake/packages/FarmhashSourceConfig.cmake diff --git a/cmake/packages/FlatBuffersConfig.cmake b/infra/nnfw/cmake/packages/FlatBuffersConfig.cmake similarity index 100% rename from cmake/packages/FlatBuffersConfig.cmake rename to infra/nnfw/cmake/packages/FlatBuffersConfig.cmake diff --git a/cmake/packages/FlatBuffersSourceConfig.cmake b/infra/nnfw/cmake/packages/FlatBuffersSourceConfig.cmake similarity index 100% rename from cmake/packages/FlatBuffersSourceConfig.cmake rename to infra/nnfw/cmake/packages/FlatBuffersSourceConfig.cmake diff --git a/cmake/packages/GEMMLowpSourceConfig.cmake b/infra/nnfw/cmake/packages/GEMMLowpSourceConfig.cmake similarity index 100% rename from cmake/packages/GEMMLowpSourceConfig.cmake rename to infra/nnfw/cmake/packages/GEMMLowpSourceConfig.cmake diff --git a/cmake/packages/GTestConfig.cmake b/infra/nnfw/cmake/packages/GTestConfig.cmake similarity index 100% rename from cmake/packages/GTestConfig.cmake rename to infra/nnfw/cmake/packages/GTestConfig.cmake diff --git a/cmake/packages/NEON2SSESourceConfig.cmake b/infra/nnfw/cmake/packages/NEON2SSESourceConfig.cmake similarity index 100% rename from cmake/packages/NEON2SSESourceConfig.cmake rename to infra/nnfw/cmake/packages/NEON2SSESourceConfig.cmake diff --git a/cmake/packages/NNPACKConfig.cmake b/infra/nnfw/cmake/packages/NNPACKConfig.cmake similarity index 100% rename from cmake/packages/NNPACKConfig.cmake rename to infra/nnfw/cmake/packages/NNPACKConfig.cmake diff --git a/cmake/packages/NNPACKSourceConfig.cmake b/infra/nnfw/cmake/packages/NNPACKSourceConfig.cmake similarity index 100% rename from cmake/packages/NNPACKSourceConfig.cmake rename to infra/nnfw/cmake/packages/NNPACKSourceConfig.cmake diff --git a/cmake/packages/Nonius/html_report_template.g.h++ b/infra/nnfw/cmake/packages/Nonius/html_report_template.g.h++ similarity index 100% rename from cmake/packages/Nonius/html_report_template.g.h++ rename to infra/nnfw/cmake/packages/Nonius/html_report_template.g.h++ diff --git a/cmake/packages/NoniusConfig.cmake b/infra/nnfw/cmake/packages/NoniusConfig.cmake similarity index 100% rename from cmake/packages/NoniusConfig.cmake rename to infra/nnfw/cmake/packages/NoniusConfig.cmake diff --git a/cmake/packages/NoniusSourceConfig.cmake b/infra/nnfw/cmake/packages/NoniusSourceConfig.cmake similarity index 100% rename from cmake/packages/NoniusSourceConfig.cmake rename to infra/nnfw/cmake/packages/NoniusSourceConfig.cmake diff --git a/cmake/packages/OpcodesSourceConfig.cmake b/infra/nnfw/cmake/packages/OpcodesSourceConfig.cmake similarity index 100% rename from cmake/packages/OpcodesSourceConfig.cmake rename to infra/nnfw/cmake/packages/OpcodesSourceConfig.cmake diff --git a/cmake/packages/PSIMDSourceConfig.cmake b/infra/nnfw/cmake/packages/PSIMDSourceConfig.cmake similarity index 100% rename from cmake/packages/PSIMDSourceConfig.cmake rename to infra/nnfw/cmake/packages/PSIMDSourceConfig.cmake diff --git a/cmake/packages/PeachpySourceConfig.cmake b/infra/nnfw/cmake/packages/PeachpySourceConfig.cmake similarity index 100% rename from cmake/packages/PeachpySourceConfig.cmake rename to infra/nnfw/cmake/packages/PeachpySourceConfig.cmake diff --git a/cmake/packages/PthreadpoolSourceConfig.cmake b/infra/nnfw/cmake/packages/PthreadpoolSourceConfig.cmake similarity index 100% rename from cmake/packages/PthreadpoolSourceConfig.cmake rename to infra/nnfw/cmake/packages/PthreadpoolSourceConfig.cmake diff --git a/cmake/packages/SixSourceConfig.cmake b/infra/nnfw/cmake/packages/SixSourceConfig.cmake similarity index 100% rename from cmake/packages/SixSourceConfig.cmake rename to infra/nnfw/cmake/packages/SixSourceConfig.cmake diff --git a/cmake/packages/TensorFlowLite/CMakeLists.txt b/infra/nnfw/cmake/packages/TensorFlowLite/CMakeLists.txt similarity index 100% rename from cmake/packages/TensorFlowLite/CMakeLists.txt rename to infra/nnfw/cmake/packages/TensorFlowLite/CMakeLists.txt diff --git a/cmake/packages/TensorFlowLiteConfig.cmake b/infra/nnfw/cmake/packages/TensorFlowLiteConfig.cmake similarity index 100% rename from cmake/packages/TensorFlowLiteConfig.cmake rename to infra/nnfw/cmake/packages/TensorFlowLiteConfig.cmake diff --git a/cmake/packages/TensorFlowSourceConfig.cmake b/infra/nnfw/cmake/packages/TensorFlowSourceConfig.cmake similarity index 100% rename from cmake/packages/TensorFlowSourceConfig.cmake rename to infra/nnfw/cmake/packages/TensorFlowSourceConfig.cmake diff --git a/cmake/packages/TensorflowConfig.cmake b/infra/nnfw/cmake/packages/TensorflowConfig.cmake similarity index 100% rename from cmake/packages/TensorflowConfig.cmake rename to infra/nnfw/cmake/packages/TensorflowConfig.cmake diff --git a/scripts/command/configure b/scripts/command/configure index 288c201..2f47dfe 100644 --- a/scripts/command/configure +++ b/scripts/command/configure @@ -9,4 +9,4 @@ INSTALL_PATH="${NNFW_INSTALL_PREFIX:-${INSTALL_ALIAS}}" mkdir -p "${BUILD_PATH}" cd "${BUILD_PATH}" -cmake "${NNFW_PROJECT_PATH}" -DCMAKE_INSTALL_PREFIX="${INSTALL_PATH}" "$@" +cmake "${NNFW_PROJECT_PATH}"/infra/nnfw -DCMAKE_INSTALL_PREFIX="${INSTALL_PATH}" "$@" -- 2.7.4