From 401765304c051b6c1066d7a5c3c1481b30a2bf25 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 18 Jun 2020 07:14:33 +0800 Subject: [PATCH] cmake: add definitions using add_definitions() also, add definitions as a list instead of a single string for better readability Signed-off-by: Kefu Chai --- src/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3c3e0bb8dbe..d46dbb5ffb2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,8 +23,13 @@ set(pkgdatadir ${CMAKE_INSTALL_FULL_DATADIR}) set(datadir ${CEPH_INSTALL_DATADIR}) set(prefix ${CMAKE_INSTALL_PREFIX}) -add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS") -add_definitions("-D_FILE_OFFSET_BITS=64") +add_definitions( + -DHAVE_CONFIG_H + -D__CEPH__ + -D_REENTRANT + -D_THREAD_SAFE + -D__STDC_FORMAT_MACROS + -D_FILE_OFFSET_BITS=64) if(LINUX) add_definitions("-D_GNU_SOURCE") endif() @@ -117,8 +122,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU) CHECK_C_COMPILER_FLAG("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" HAS_FORTIFY_SOURCE) if(NOT CMAKE_BUILD_TYPE STREQUAL Debug) if(HAS_FORTIFY_SOURCE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") + add_definitions( + -U_FORTIFY_SOURCE + -D_FORTIFY_SOURCE=2) endif() endif() CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STACK_PROTECT) -- 2.47.3