From 80214abbd0d46792fc7eb6cec79699cfb111c871 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:43:18 +0800
Subject: [PATCH 01/13] mkdir bzip2 include directory

Former-commit-id: a94b41bc5a865f52c1456b636b83158dd24c2e5b
---
 cpp/cmake/ThirdPartyPackages.cmake | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index dd0dfe4de0..b4f239a676 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -154,6 +154,11 @@ if (UNIX)
     endif (APPLE)
 endif (UNIX)
 
+
+# ----------------------------------------------------------------------
+# thirdparty directory
+set(THIRDPARTY_DIR "${MILVUS_SOURCE_DIR}/thirdparty")
+
 # ----------------------------------------------------------------------
 # JFrog
 if(NOT DEFINED USE_JFROG_CACHE)
@@ -244,7 +249,6 @@ find_package(Threads REQUIRED)
 # offline builds
 
 # Read toolchain versions from cpp/thirdparty/versions.txt
-set(THIRDPARTY_DIR "${MILVUS_SOURCE_DIR}/thirdparty")
 file(STRINGS "${THIRDPARTY_DIR}/versions.txt" TOOLCHAIN_VERSIONS_TXT)
 foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT})
     # Exclude comments
@@ -653,11 +657,8 @@ macro(build_bzip2)
                                 "${BZIP2_STATIC_LIB}")
 
             ExternalProject_Create_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/bzip2_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${BZIP2_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${BZIP2_INCLUDE_DIR}")
-
         else()
-             ExternalProject_Use_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})   
+            ExternalProject_Use_Cache(bzip2_ep ${BZIP2_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
     else()
         externalproject_add(bzip2_ep
@@ -680,10 +681,10 @@ macro(build_bzip2)
                                 URL
                                 ${BZIP2_SOURCE_URL}
                                 BUILD_BYPRODUCTS
-                                "${BZIP2_STATIC_LIB}")    
-        file(MAKE_DIRECTORY "${BZIP2_INCLUDE_DIR}")
-    endif()    
-        
+                                "${BZIP2_STATIC_LIB}")
+    endif()
+
+    file(MAKE_DIRECTORY "${BZIP2_INCLUDE_DIR}")
     add_library(bzip2 STATIC IMPORTED)
     set_target_properties(
             bzip2

From bb522bb03c4621cf2ad0f4efea0a6e64c3c2a3f7 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:44:17 +0800
Subject: [PATCH 02/13] mkdir easyloggingpp include directory

Former-commit-id: 2546463d12a27ab7f4ff47e7c2db2ea781cb5359
---
 cpp/cmake/ThirdPartyPackages.cmake | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index b4f239a676..b670bdccfe 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -795,8 +795,6 @@ macro(build_easyloggingpp)
                 ${EASYLOGGINGPP_STATIC_LIB})
 
             ExternalProject_Create_Cache(easyloggingpp_ep ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/easyloggingpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${EASYLOGGINGPP_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${EASYLOGGINGPP_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(easyloggingpp_ep ${EASYLOGGINGPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -812,11 +810,9 @@ macro(build_easyloggingpp)
                 ${MAKE_BUILD_ARGS}
                 BUILD_BYPRODUCTS
                 ${EASYLOGGINGPP_STATIC_LIB})
-
-        file(MAKE_DIRECTORY "${EASYLOGGINGPP_INCLUDE_DIR}")
     endif()
 
-
+    file(MAKE_DIRECTORY "${EASYLOGGINGPP_INCLUDE_DIR}")
     add_library(easyloggingpp STATIC IMPORTED)
     set_target_properties(
             easyloggingpp

From a7ce37649a3e3ea6c729d3b83b442335763523e2 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:45:25 +0800
Subject: [PATCH 03/13] mkdir faiss include directory

Former-commit-id: 0ce0323e6fa1beded9a007b5aabeecc9c198a9e8
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index b670bdccfe..2a9b80474b 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1064,8 +1064,6 @@ macro(build_faiss)
             endif()
 
             ExternalProject_Create_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/faiss_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${FAISS_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${FAISS_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(faiss_ep ${FAISS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1089,10 +1087,9 @@ macro(build_faiss)
         if(${BUILD_FAISS_WITH_MKL} STREQUAL "OFF")
             ExternalProject_Add_StepDependencies(faiss_ep build openblas_ep lapack_ep)
         endif()
-
-        file(MAKE_DIRECTORY "${FAISS_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${FAISS_INCLUDE_DIR}")
     add_library(faiss SHARED IMPORTED)
 
     if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")

From 2716ee7c1efcf9f110e90179e2a4757f01dfc8bd Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:47:05 +0800
Subject: [PATCH 04/13] mkdir lapack include directory

Former-commit-id: eb165bd6a279ea3a0ffddb1330d3cd9708255217
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 2a9b80474b..307a69de74 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -941,8 +941,6 @@ macro(build_lapack)
                     ${LAPACK_STATIC_LIB})
 
             ExternalProject_Create_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/lapack_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LAPACK_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${LAPACK_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(lapack_ep ${LAPACK_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -958,10 +956,9 @@ macro(build_lapack)
                     ${MAKE_BUILD_ARGS}
                     BUILD_BYPRODUCTS
                     ${LAPACK_STATIC_LIB})
-
-        file(MAKE_DIRECTORY "${LAPACK_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${LAPACK_INCLUDE_DIR}")
     add_library(lapack STATIC IMPORTED)
     set_target_properties(
             lapack

From 5e671008bf35337d17e9822fbb06f8a9e7c3e502 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:48:10 +0800
Subject: [PATCH 05/13] mkdir lz4 include directory

Former-commit-id: 3302aac83877e89da70bc431743ea1693bb577da
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 307a69de74..5d390840e3 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1286,8 +1286,6 @@ macro(build_lz4)
                     ${LZ4_BUILD_COMMAND})
 
             ExternalProject_Create_Cache(lz4_ep ${LZ4_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/lz4_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${LZ4_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${LZ4_PREFIX}/include")
         else()
             ExternalProject_Use_Cache(lz4_ep ${LZ4_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1312,10 +1310,9 @@ macro(build_lz4)
                 BUILD_BYPRODUCTS
                 ${LZ4_STATIC_LIB}
                 ${LZ4_BUILD_COMMAND})
-
-        file(MAKE_DIRECTORY "${LZ4_PREFIX}/include")
     endif()
 
+    file(MAKE_DIRECTORY "${LZ4_PREFIX}/include")
     add_library(lz4 STATIC IMPORTED)
     set_target_properties(lz4
             PROPERTIES IMPORTED_LOCATION "${LZ4_STATIC_LIB}"

From 8aca3e83fbdf7943a31f26406648c6ccf723d179 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:48:52 +0800
Subject: [PATCH 06/13] mkdir mysqlcpp include directory

Former-commit-id: 16691c62dbf404739436ced50aec7b34cfbd7d14
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 5d390840e3..805783bdcb 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1369,8 +1369,6 @@ macro(build_mysqlpp)
                     ${MYSQLPP_SHARED_LIB})
 
             ExternalProject_Create_Cache(mysqlpp_ep ${MYSQLPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/mysqlpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${MYSQLPP_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${MYSQLPP_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(mysqlpp_ep ${MYSQLPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1388,10 +1386,9 @@ macro(build_mysqlpp)
                 1
                 BUILD_BYPRODUCTS
                 ${MYSQLPP_SHARED_LIB})
-
-        file(MAKE_DIRECTORY "${MYSQLPP_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${MYSQLPP_INCLUDE_DIR}")
     add_library(mysqlpp SHARED IMPORTED)
     set_target_properties(
             mysqlpp

From 441dda4b6fa7e08151de77383e75751719f34f7b Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:50:31 +0800
Subject: [PATCH 07/13] mkdir snappy include directory

Former-commit-id: 250153a3d06d418800ae52ffda48c24b634d3633
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 805783bdcb..9b90aca70d 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1586,8 +1586,6 @@ macro(build_snappy)
                     "${SNAPPY_STATIC_LIB}")
 
             ExternalProject_Create_Cache(snappy_ep ${SNAPPY_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/snappy_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${SNAPPY_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${SNAPPY_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(snappy_ep ${SNAPPY_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1607,10 +1605,9 @@ macro(build_snappy)
                 ${SNAPPY_CMAKE_ARGS}
                 BUILD_BYPRODUCTS
                 "${SNAPPY_STATIC_LIB}")
-
-        file(MAKE_DIRECTORY "${SNAPPY_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${SNAPPY_INCLUDE_DIR}")
     add_library(snappy STATIC IMPORTED)
     set_target_properties(snappy
                         PROPERTIES IMPORTED_LOCATION "${SNAPPY_STATIC_LIB}"

From f2f4cadc727276c267358679f0e8ec554f09e2b3 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:51:35 +0800
Subject: [PATCH 08/13] mkdir sqlite include directory

Former-commit-id: 10916354e7c5d9fcac97eee522f15e900613d59b
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 9b90aca70d..914e246a0d 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1667,8 +1667,6 @@ macro(build_sqlite)
                     "${SQLITE_STATIC_LIB}")
 
             ExternalProject_Create_Cache(sqlite_ep ${SQLITE_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/sqlite_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${SQLITE_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${SQLITE_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(sqlite_ep ${SQLITE_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1687,10 +1685,9 @@ macro(build_sqlite)
                 1
                 BUILD_BYPRODUCTS
                 "${SQLITE_STATIC_LIB}")
-
-        file(MAKE_DIRECTORY "${SQLITE_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${SQLITE_INCLUDE_DIR}")
     add_library(sqlite STATIC IMPORTED)
     set_target_properties(
             sqlite

From 2b4f3fe8969d883e194a6f7f3f7aa6d767e9df7e Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:53:27 +0800
Subject: [PATCH 09/13] mkdir thrift include directory

Former-commit-id: 740f163029d6be2ace00e41e238d41ab3c1cffe4
---
 cpp/cmake/ThirdPartyPackages.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 914e246a0d..65c9c1f65c 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1804,9 +1804,6 @@ macro(build_thrift)
                     ${EP_LOG_OPTIONS})
 
             ExternalProject_Create_Cache(thrift_ep ${THRIFT_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${THRIFT_CACHE_URL})
-
-            # The include directory must exist before it is referenced by a target.
-            file(MAKE_DIRECTORY "${THRIFT_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(thrift_ep ${THRIFT_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1827,11 +1824,10 @@ macro(build_thrift)
                 DEPENDS
                 ${THRIFT_DEPENDENCIES}
                 ${EP_LOG_OPTIONS})
-
-        # The include directory must exist before it is referenced by a target.
-        file(MAKE_DIRECTORY "${THRIFT_INCLUDE_DIR}")
     endif()
 
+    # The include directory must exist before it is referenced by a target.
+    file(MAKE_DIRECTORY "${THRIFT_INCLUDE_DIR}")
     add_library(thrift STATIC IMPORTED)
     set_target_properties(thrift
             PROPERTIES IMPORTED_LOCATION "${THRIFT_STATIC_LIB}"

From b5f9c9ee02a6c1ef68ef5f86ac335a8c3dd07d7b Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:54:35 +0800
Subject: [PATCH 10/13] mkdir thrift include directory

Former-commit-id: 044d2d2cea862e02e24cd211b676d6d8a2c9e95a
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 65c9c1f65c..87cb4df36d 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1882,8 +1882,6 @@ macro(build_yamlcpp)
                     ${YAMLCPP_CMAKE_ARGS})
 
             ExternalProject_Create_Cache(yaml-cpp_ep ${YAMLCPP_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${YAMLCPP_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${YAMLCPP_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(yaml-cpp_ep ${YAMLCPP_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1899,10 +1897,9 @@ macro(build_yamlcpp)
                 "${YAMLCPP_STATIC_LIB}"
                 CMAKE_ARGS
                 ${YAMLCPP_CMAKE_ARGS})
-
-        file(MAKE_DIRECTORY "${YAMLCPP_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${YAMLCPP_INCLUDE_DIR}")
     add_library(yaml-cpp STATIC IMPORTED)
     set_target_properties(yaml-cpp
             PROPERTIES IMPORTED_LOCATION "${YAMLCPP_STATIC_LIB}"

From bb93daef2fc1d1ec7f655756528d4d3146891b84 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:55:35 +0800
Subject: [PATCH 11/13] mkdir zlib include directory

Former-commit-id: 2dfe47791648fad2a44c7ac829a3edd4bae54002
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 87cb4df36d..dd984c920c 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -1950,8 +1950,6 @@ macro(build_zlib)
                     ${ZLIB_CMAKE_ARGS})
 
             ExternalProject_Create_Cache(zlib_ep ${ZLIB_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ZLIB_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${ZLIB_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(zlib_ep ${ZLIB_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -1967,10 +1965,9 @@ macro(build_zlib)
                 "${ZLIB_STATIC_LIB}"
                 CMAKE_ARGS
                 ${ZLIB_CMAKE_ARGS})
-
-        file(MAKE_DIRECTORY "${ZLIB_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${ZLIB_INCLUDE_DIR}")
     add_library(zlib STATIC IMPORTED)
     set_target_properties(zlib
             PROPERTIES IMPORTED_LOCATION "${ZLIB_STATIC_LIB}"

From 0f5363707520db9595b0fbab772a96e8c365f54a Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:56:47 +0800
Subject: [PATCH 12/13] mkdir zstd include directory

Former-commit-id: 43f3350691d15bb2541ac0ba1b6287b9f5171a0a
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index dd984c920c..c6e673432e 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -2040,8 +2040,6 @@ macro(build_zstd)
                     "${ZSTD_STATIC_LIB}")
 
             ExternalProject_Create_Cache(zstd_ep ${ZSTD_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ZSTD_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${ZSTD_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(zstd_ep ${ZSTD_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -2061,10 +2059,9 @@ macro(build_zstd)
                 ${ZSTD_SOURCE_URL}
                 BUILD_BYPRODUCTS
                 "${ZSTD_STATIC_LIB}")
-
-        file(MAKE_DIRECTORY "${ZSTD_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${ZSTD_INCLUDE_DIR}")
     add_library(zstd STATIC IMPORTED)
     set_target_properties(zstd
             PROPERTIES IMPORTED_LOCATION "${ZSTD_STATIC_LIB}"

From 28f82df09c98a33f5e129331e1990d8643facafd Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 10:57:39 +0800
Subject: [PATCH 13/13] mkdir aws include directory

Former-commit-id: 72e05aaa1bd5757af5a31fa46f54d3beca21e2aa
---
 cpp/cmake/ThirdPartyPackages.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index c6e673432e..a4f97269c5 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -2132,8 +2132,6 @@ macro(build_aws)
                     "${AWS_CPP_SDK_CORE_STATIC_LIB}")
 
             ExternalProject_Create_Cache(aws_ep ${AWS_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/aws_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${AWS_CACHE_URL})
-
-            file(MAKE_DIRECTORY "${AWS_INCLUDE_DIR}")
         else()
             ExternalProject_Use_Cache(aws_ep ${AWS_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -2152,10 +2150,9 @@ macro(build_aws)
                 BUILD_BYPRODUCTS
                 "${AWS_CPP_SDK_S3_STATIC_LIB}"
                 "${AWS_CPP_SDK_CORE_STATIC_LIB}")
-
-        file(MAKE_DIRECTORY "${AWS_INCLUDE_DIR}")
     endif()
 
+    file(MAKE_DIRECTORY "${AWS_INCLUDE_DIR}")
     add_library(aws-cpp-sdk-s3 STATIC IMPORTED)
     set_target_properties(aws-cpp-sdk-s3
             PROPERTIES