From fc3839ccc56b2ba9ead2d89ad0060053affecc12 Mon Sep 17 00:00:00 2001 From: Wang XiangYu Date: Mon, 27 Jul 2020 19:31:51 +0800 Subject: [PATCH] add cmake macro (#3036) * add cmake macro Signed-off-by: wxyu * remove unused code Signed-off-by: wxyu --- core/CMakeLists.txt | 15 +++++++++++---- core/cmake/Utils.cmake | 7 +++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 4a29e302a8..546c8a6d7f 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -77,15 +77,22 @@ set_milvus_definition(MILVUS_WITH_FIU "FIU_ENABLE") config_summary() if (CMAKE_BUILD_TYPE STREQUAL "Release") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -DELPP_THREAD_SAFE -fopenmp") - set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O3") + append_flags(CMAKE_CXX_FLAGS FLAGS "-O3") + append_flags(CUDA_NVCC_FLAGS FLAGS "-O3") elseif (CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fPIC -DELPP_THREAD_SAFE -fopenmp") - set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O0 -g") + append_flags(CMAKE_CXX_FLAGS FLAGS "-O0" "-g") + append_flags(CUDA_NVCC_FLAGS FLAGS "-O0" "-g") else () message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") endif () +append_flags(CMAKE_CXX_FLAGS + FLAGS + "-fPIC" + "-DELPP_THREAD_SAFE" + "-fopenmp" + ) + # **************************** Source files **************************** add_subdirectory(src) diff --git a/core/cmake/Utils.cmake b/core/cmake/Utils.cmake index 98deaa2076..387f7cbb4e 100644 --- a/core/cmake/Utils.cmake +++ b/core/cmake/Utils.cmake @@ -78,3 +78,10 @@ MACRO(set_milvus_definition DEF_PASS_CMAKE MILVUS_DEF) add_compile_definitions(${MILVUS_DEF}) endif() ENDMACRO(set_milvus_definition) + +MACRO(append_flags target) + cmake_parse_arguments(M "" "" "FLAGS" ${ARGN}) + foreach(FLAG IN ITEMS ${M_FLAGS}) + set(${target} "${${target}} ${FLAG}") + endforeach() +ENDMACRO(append_flags)