milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix thirdparty not find ccache but still use it (#3398) 

* fix sqlite ccache

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* thirdparty EP using ccache configure

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

Co-authored-by: yangxuan <xuan.yang@zilliz.com>
pull/3341/head^2
XuanYang-cn 2020-08-22 11:32:00 +08:00 committed by GitHub
parent 31868b89ef
commit f2ef1cd07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/thirdparty/CMakeLists.txt vendored
View File

@ -33,6 +33,16 @@ else()
endif()
message( STATUS "Thirdparty downloaded file path: ${THIRDPARTY_DOWNLOAD_PATH}" )
# ----------------------------------------------------------------------
# using ccache
if( CCACHE_FOUND )
set( EP_C_COMPILER "${CCACHE_FOUND} ${CMAKE_C_COMPILER}" )
set( EP_CXX_COMPILER "${CCACHE_FOUND} ${CMAKE_CXX_COMPILER}" )
else()
set( EP_C_COMPILER ${CMAKE_C_COMPILER} )
set( EP_CXX_COMPILER ${CMAKE_CXX_COMPILER} )
endif()
# ----------------------------------------------------------------------
# Find pthreads

4
core/thirdparty/mysqlpp/CMakeLists.txt vendored
View File

@ -32,8 +32,8 @@ macro( build_mysqlpp )
"--enable-thread-check"
"CXXFLAGS=${MYSQLPP_CXX_FLAGS}"
"LDFLAGS=-pthread"
"cc=${CCACHE_FOUND} ${CMAKE_C_COMPILER}"
"cxx=${CCACHE_FOUND} ${CMAKE_CXX_COMPILER}"
"cc=${EP_C_COMPILER}"
"cxx=${EP_CXX_COMPILER}"
BUILD_COMMAND ${MAKE} ${MAKE_BUILD_ARGS}
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1

8
core/thirdparty/profilers/CMakeLists.txt vendored
View File

@ -42,8 +42,8 @@ macro( build_libunwind )
"--prefix=<INSTALL_DIR>"
"--quiet"
"--disable-tests"
"cc=${CCACHE_FOUND} ${CMAKE_C_COMPILER}"
"cxx=${CCACHE_FOUND} ${CMAKE_CXX_COMPILER}"
"cc=${EP_C_COMPILER}"
"cxx=${EP_CXX_COMPILER}"
BUILD_COMMAND ${MAKE} ${MAKE_BUILD_ARGS}
INSTALL_COMMAND ${MAKE} install
${EP_LOG_OPTIONS} )
@ -78,8 +78,8 @@ macro( build_gperftools )
CONFIGURE_COMMAND <SOURCE_DIR>/configure
"--prefix=<INSTALL_DIR>"
"--quiet"
"cc=${CCACHE_FOUND} ${CMAKE_C_COMPILER}"
"cxx=${CCACHE_FOUND} ${CMAKE_CXX_COMPILER}"
"cc=${EP_C_COMPILER}"
"cxx=${EP_CXX_COMPILER}"
BUILD_COMMAND ${MAKE} ${MAKE_BUILD_ARGS}
INSTALL_COMMAND ${MAKE} install
${EP_LOG_OPTIONS} )

4
core/thirdparty/sqlite/CMakeLists.txt vendored
View File

@ -29,8 +29,8 @@ macro( build_sqlite )
URL_MD5 "3c68eb400f8354605736cd55400e1572"
CONFIGURE_COMMAND <SOURCE_DIR>/configure
"--prefix=<INSTALL_DIR>"
"CC=${CCACHE_FOUND} ${CMAKE_C_COMPILER}"
"CXX=${CCACHE_FOUND} ${CMAKE_CXX_COMPILER}"
"CC=${EP_C_COMPILER}"
"CXX=${EP_CXX_COMPILER}"
"CFLAGS=${EP_C_FLAGS}"
"CXXFLAGS=-O3 -fPIC -Wno-error -fopenmp"
BUILD_COMMAND ${MAKE} ${MAKE_BUILD_ARGS}