Relocate CMakeLists.txt (#4358)

* Relocate CMakeLists.txt

Now, CMakeLists.txt in in infra/nncc directory.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
* Fix nncc_find_resource

diff --git a/CMakeLists.txt b/infra/nncc/CMakeLists.txt
similarity index 94%
rename from CMakeLists.txt
rename to infra/nncc/CMakeLists.txt
index 9a35464..f60799c 100644 (file)
--- a/CMakeLists.txt
+++ b/infra/nncc/CMakeLists.txt
@@ -13,12 +13,12 @@ set(CMAKE_CXX_STANDARD 11)
 #       such as `cmake-server`.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(NNCC_PROJECT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE
+set(NNCC_PROJECT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE
   INTERNAL "Where to find nncc top-level source directory"
 )
 
 set(NNCC_EXTERNALS_DIR
-  "${CMAKE_CURRENT_LIST_DIR}/externals" CACHE
+  "${NNCC_PROJECT_SOURCE_DIR}/externals" CACHE
   INTERNAL "Where to download external dependencies"
 )
 set(NNCC_OVERLAY_DIR "${CMAKE_BINARY_DIR}/overlay" CACHE
@@ -45,7 +45,7 @@ endmacro(nncc_find_package)
 #
 # TODO Explain how to add a resource in README.md
 function(nncc_find_resource NAME)
-  set(RESOURCE_DIR "${CMAKE_SOURCE_DIR}/res/${NAME}")
+  set(RESOURCE_DIR "${NNCC_PROJECT_SOURCE_DIR}/res/${NAME}")
 
   if(NOT IS_DIRECTORY ${RESOURCE_DIR})
     set(${NAME}_FOUND FALSE PARENT_SCOPE)
@@ -146,5 +146,5 @@ nncc_include(add_subdirectories)
 ### Components
 ###
 if(ENABLE_CONTRIB_BUILD)
-  add_subdirectory(compiler)
+  add_subdirectory("${NNCC_PROJECT_SOURCE_DIR}/compiler" "${CMAKE_BINARY_DIR}/compiler")
 endif(ENABLE_CONTRIB_BUILD)

diff --git a/infra/nncc/command/configure b/infra/nncc/command/configure
index 5b4719f..2648cb8 100644 (file)
--- a/infra/nncc/command/configure
+++ b/infra/nncc/command/configure
@@ -7,4 +7,4 @@ BUILD_WORKSPACE_PATH="${NNCC_PROJECT_PATH}/${BUILD_WORKSPACE_RPATH}"
 mkdir -p "${BUILD_WORKSPACE_PATH}"
 
 cd "${BUILD_WORKSPACE_PATH}"
-cmake "${NNCC_PROJECT_PATH}" "$@"
+cmake "${NNCC_PROJECT_PATH}/infra/nncc" "$@"