[infra/cmake] Clean external dir and overlay (#9356)

- Remove NNCC_EXTERNAL_DIR
- Remove NNAS_OVERLAY_DIR
  - Use NNFW_OVERLAY_DIR for runtime (cross build)
  - Use NNCC_OVERLAY_DIR for compiler
  - Set EXT_OVERLAY_DIR on each cmake script

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/infra/cmake/packages/ARMComputeConfig.cmake b/infra/cmake/packages/ARMComputeConfig.cmake
index 99be6b7..ef70574 100644 (file)
--- a/infra/cmake/packages/ARMComputeConfig.cmake
+++ b/infra/cmake/packages/ARMComputeConfig.cmake
@@ -178,7 +178,7 @@ function(_ARMCompute_Build ARMCompute_INSTALL_PREFIX)
 endfunction(_ARMCompute_Build)
 
 
-set(ARMCompute_PREFIX ${NNFW_OVERLAY_DIR}/lib)
+set(ARMCompute_PREFIX ${EXT_OVERLAY_DIR}/lib)
 
 # This is a workaround for CI issues
 # Ps. CI server will copy below installed libraries to target device to test.

diff --git a/infra/cmake/packages/FlatBuffersConfig.cmake b/infra/cmake/packages/FlatBuffersConfig.cmake
index ed3f466..4eb957c 100644 (file)
--- a/infra/cmake/packages/FlatBuffersConfig.cmake
+++ b/infra/cmake/packages/FlatBuffersConfig.cmake
@@ -23,7 +23,7 @@ function(_FlatBuffers_build)
   nnas_include(ExternalBuildTools)
   ExternalBuild_CMake(CMAKE_DIR   ${FlatBuffersSource_DIR}
                       BUILD_DIR   ${CMAKE_BINARY_DIR}/externals/FLATBUFFERS/build
-                      INSTALL_DIR ${NNAS_OVERLAY_DIR}
+                      INSTALL_DIR ${EXT_OVERLAY_DIR}
                       BUILD_FLAGS ${ADDITIONAL_CXX_FLAGS}
                       IDENTIFIER  "1.10"
                       PKG_NAME    "FLATBUFFERS")

diff --git a/infra/cmake/packages/GTestConfig.cmake b/infra/cmake/packages/GTestConfig.cmake
index 9c74e57..1d56814 100644 (file)
--- a/infra/cmake/packages/GTestConfig.cmake
+++ b/infra/cmake/packages/GTestConfig.cmake
@@ -12,7 +12,7 @@ function(_GTest_build)
   nnas_include(ExternalBuildTools)
   ExternalBuild_CMake(CMAKE_DIR   ${GTestSource_DIR}
                       BUILD_DIR   ${CMAKE_BINARY_DIR}/externals/GTEST/build
-                      INSTALL_DIR ${NNAS_OVERLAY_DIR}
+                      INSTALL_DIR ${EXT_OVERLAY_DIR}
                       IDENTIFIER  "1.8.0"
                       PKG_NAME    "GTEST")
 

diff --git a/infra/cmake/packages/ProtobufConfig.cmake b/infra/cmake/packages/ProtobufConfig.cmake
index f517b49..dee0c33 100644 (file)
--- a/infra/cmake/packages/ProtobufConfig.cmake
+++ b/infra/cmake/packages/ProtobufConfig.cmake
@@ -55,7 +55,7 @@ function(_Protobuf_build)
   nnas_include(ExternalBuildTools)
   ExternalBuild_CMake(CMAKE_DIR   ${ProtobufSource_DIR}/cmake
                       BUILD_DIR   ${CMAKE_BINARY_DIR}/externals/PROTOBUF/build
-                      INSTALL_DIR ${NNAS_OVERLAY_DIR}
+                      INSTALL_DIR ${EXT_OVERLAY_DIR}
                       BUILD_FLAGS -fPIC
                       EXTRA_OPTS  -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_WITH_ZLIB=OFF
                       IDENTIFIER  "3.5.2"

diff --git a/infra/nncc/CMakeLists.txt b/infra/nncc/CMakeLists.txt
index a9ce60f..d2901c3 100644 (file)
--- a/infra/nncc/CMakeLists.txt
+++ b/infra/nncc/CMakeLists.txt
@@ -22,21 +22,18 @@ set(NNAS_PROJECT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE
   INTERNAL "Where to find nnas top-level source directory"
 )
 
-set(NNCC_EXTERNALS_DIR
+set(NNAS_EXTERNALS_DIR
   "${NNAS_PROJECT_SOURCE_DIR}/externals" CACHE
   INTERNAL "Where to download external dependencies"
 )
 set(NNCC_OVERLAY_DIR "${CMAKE_BINARY_DIR}/overlay" CACHE
     INTERNAL "Where locally built external dependencies are installed")
-# TODO Remove NNCC_EXTERNALS_DIR and NNCC_OVERLAY_DIR
-set(NNAS_EXTERNALS_DIR ${NNCC_EXTERNALS_DIR} CACHE
-  INTERNAL "Where to download external dependencies")
-set(NNAS_OVERLAY_DIR ${NNCC_OVERLAY_DIR} CACHE
-  INTERNAL "Where locally built external dependencies are installed")
 
+# Share package build script with runtime
+set(EXT_OVERLAY_DIR ${NNCC_OVERLAY_DIR})
 
 # This allows find_package to access configurations installed inside overlay
-list(APPEND CMAKE_PREFIX_PATH "${NNCC_OVERLAY_DIR}")
+list(APPEND CMAKE_PREFIX_PATH "${EXT_OVERLAY_DIR}")
 
 macro(nnas_include PREFIX)
   include("${NNAS_PROJECT_SOURCE_DIR}/infra/cmake/modules/${PREFIX}.cmake")

diff --git a/infra/nnfw/CMakeLists.txt b/infra/nnfw/CMakeLists.txt
index 8692e91..6b5c465 100644 (file)
--- a/infra/nnfw/CMakeLists.txt
+++ b/infra/nnfw/CMakeLists.txt
@@ -17,13 +17,14 @@ set(NNAS_EXTERNALS_DIR
   "${NNAS_PROJECT_SOURCE_DIR}/externals" CACHE
   INTERNAL "Where to download external dependencies"
 )
-set(NNAS_OVERLAY_DIR "${CMAKE_BINARY_DIR}/overlay" CACHE
-    INTERNAL "Where locally built external dependencies are installed")
 set(NNFW_OVERLAY_DIR "${CMAKE_BINARY_DIR}/overlay" CACHE
-    INTERNAL "Where locally built external dependencies for target are installed")
+    INTERNAL "Where locally built external dependencies are installed")
+
+# Share package build script with compiler
+set(EXT_OVERLAY_DIR ${NNFW_OVERLAY_DIR})
 
 # This allows find_package to access configurations installed inside overlay
-list(APPEND CMAKE_PREFIX_PATH "${NNAS_OVERLAY_DIR}")
+list(APPEND CMAKE_PREFIX_PATH "${EXT_OVERLAY_DIR}")
 
 macro(nnas_include PREFIX)
   include("${NNAS_PROJECT_SOURCE_DIR}/infra/cmake/modules/${PREFIX}.cmake")