From: Ali Maredia <amaredia@redhat.com>
Date: Tue, 28 Jun 2016 18:46:26 +0000 (-0400)
Subject: Merge pull request #9975 from ceph/wip-cmake
X-Git-Tag: ses5-milestone5~586
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=864d1b3e972836f3be7e3076e37298ca92ea4bb5;p=ceph.git

Merge pull request #9975 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
---

864d1b3e972836f3be7e3076e37298ca92ea4bb5
diff --cc src/CMakeLists.txt
index 0bda6635f738,641fdb83a3a8..9ff15d92d0fd
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -25,9 -25,18 +25,19 @@@ if(NOT CMAKE_BUILD_TYPE
    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Default BUILD_TYPE is RelWithDebInfo, other options are: Debug, Release, and MinSizeRel." FORCE) 
  endif()
  
+ if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+   # we use assert(3) for testing, so scrub the -DNDEBUG defined by default
+   string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type_upper)
+   foreach(flags
+       CMAKE_CXX_FLAGS_${build_type_upper}
+       CMAKE_C_FLAGS_${build_type_upper})
+     string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " "${flags}" "${${flags}}")
+   endforeach()
+ endif()
+ 
  include(CheckCCompilerFlag)
 -CHECK_C_COMPILER_FLAG("-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2 -Werror" HAS_FORTIFY_SOURCE)
 +CHECK_C_COMPILER_FLAG("-Wp,-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} -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2")
  endif()