ExternalProejctTools as a module (#1453)

Similarly as ExternalSourceTool, ExternalProejctTools also does not fin
into the concept of packages in nncc.

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

diff --git a/cmake/packages/ExternalProjectToolsConfig.cmake b/cmake/modules/ExternalProjectTools.cmake
similarity index 76%
rename from cmake/packages/ExternalProjectToolsConfig.cmake
rename to cmake/modules/ExternalProjectTools.cmake
index 7dde65f..11446c0 100644 (file)
--- a/cmake/packages/ExternalProjectToolsConfig.cmake
+++ b/cmake/modules/ExternalProjectTools.cmake
@@ -1,5 +1,3 @@
 macro(add_extdirectory DIR TAG)
   add_subdirectory(${DIR} "${CMAKE_BINARY_DIR}/externals/${TAG}")
 endmacro(add_extdirectory)
-
-set(ExternalProjectTools_FOUND TRUE)

diff --git a/cmake/packages/CaffeConfig.cmake b/cmake/packages/CaffeConfig.cmake
index 1b44d03..7b5eb2f 100644 (file)
--- a/cmake/packages/CaffeConfig.cmake
+++ b/cmake/packages/CaffeConfig.cmake
@@ -51,7 +51,7 @@ function(_Caffe_import)
   endif()
 
   if(NOT TARGET caffe)
-    nncc_find_package(ExternalProjectTools REQUIRED)
+    nncc_include(ExternalProjectTools)
     add_extdirectory("${CMAKE_CURRENT_LIST_DIR}/Caffe" caffe)
     message(STATUS "Found Caffe: TRUE")
   endif(NOT TARGET caffe)

diff --git a/cmake/packages/CaffeProtoConfig.cmake b/cmake/packages/CaffeProtoConfig.cmake
index d965744..33c2395 100644 (file)
--- a/cmake/packages/CaffeProtoConfig.cmake
+++ b/cmake/packages/CaffeProtoConfig.cmake
@@ -14,7 +14,7 @@ function(_CaffeProto_import)
   endif(NOT Protobuf_FOUND)
 
   if(NOT TARGET caffeproto)
-    nncc_find_package(ExternalProjectTools REQUIRED)
+    nncc_include(ExternalProjectTools)
     add_extdirectory("${CMAKE_CURRENT_LIST_DIR}/CaffeProto" caffeproto)
   endif(NOT TARGET caffeproto)
 

diff --git a/cmake/packages/FarmhashConfig.cmake b/cmake/packages/FarmhashConfig.cmake
index e3f5e5c..68f3d7c 100644 (file)
--- a/cmake/packages/FarmhashConfig.cmake
+++ b/cmake/packages/FarmhashConfig.cmake
@@ -7,7 +7,7 @@ function(_Farmhash_import)
   endif(NOT FarmhashSource_FOUND)
 
   if(NOT TARGET farmhash)
-    nncc_find_package(ExternalProjectTools REQUIRED)
+    nncc_include(ExternalProjectTools)
     add_extdirectory("${CMAKE_CURRENT_LIST_DIR}/Farmhash" farmhash)
   endif(NOT TARGET farmhash)
 

diff --git a/cmake/packages/GFlagsConfig.cmake b/cmake/packages/GFlagsConfig.cmake
index 5b6f640..891320a 100644 (file)
--- a/cmake/packages/GFlagsConfig.cmake
+++ b/cmake/packages/GFlagsConfig.cmake
@@ -7,7 +7,7 @@ function(_GFlags_import)
   nncc_find_package(GFlagsSource QUIET)
 
   if(GFlagsSource_FOUND)
-    nncc_find_package(ExternalProjectTools REQUIRED)
+    nncc_include(ExternalProjectTools)
     # build shared multi-threading gflag library
     set(BUILD_SHARED_LIBS On)
     set(BUILD_STATIC_LIBS Off)

diff --git a/cmake/packages/GTestConfig.cmake b/cmake/packages/GTestConfig.cmake
index 32b1142..3b5337c 100644 (file)
--- a/cmake/packages/GTestConfig.cmake
+++ b/cmake/packages/GTestConfig.cmake
@@ -1,6 +1,6 @@
 if(${BUILD_GTEST})
   nncc_include(ExternalSourceTools)
-  nncc_find_package(ExternalProjectTools REQUIRED)
+  nncc_include(ExternalProjectTools)
   nncc_find_package(OptionTools REQUIRED)
 
   envoption(GTEST_URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz)

diff --git a/cmake/packages/TensorFlowLiteConfig.cmake b/cmake/packages/TensorFlowLiteConfig.cmake
index cb5e5e5..dcf59cd 100644 (file)
--- a/cmake/packages/TensorFlowLiteConfig.cmake
+++ b/cmake/packages/TensorFlowLiteConfig.cmake
@@ -42,7 +42,7 @@ function(_TensorFlowLite_import)
   endif(NOT NEON2SSE_FOUND)
 
   if(NOT TARGET tensorflowlite)
-    nncc_find_package(ExternalProjectTools REQUIRED)
+    nncc_include(ExternalProjectTools)
     add_extdirectory("${CMAKE_CURRENT_LIST_DIR}/TensorFlowLite" tflite)
   endif(NOT TARGET tensorflowlite)