Merge pull request ceph#63182 from Matan-B/wip-matanb-crimson-tentacle-cmake-rel

tentacle: CMakeLists: Fallback to RelWithDebInfo

Reviewed-by: Samuel Just <[email protected]>
Reviewed-by: Patrick Donnelly <[email protected]>

Author: Matan-B

CMakeLists.txt

@@ -16,12 +16,15 @@ if(NOT CMAKE_BUILD_TYPE)
   if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
     message(WARNING "CMAKE_BUILD_TYPE not specified, assuming CMAKE_BUILD_TYPE=Debug because .git exists.")
     set(default_build_type "Debug")
-    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
-        STRING "Default BUILD_TYPE is Debug, other options are: RelWithDebInfo, Release, and MinSizeRel." FORCE)
   else()
-    message(WARNING "CMAKE_BUILD_TYPE not specified, leaving unset because .git does NOT exist.")
+    message(WARNING "CMAKE_BUILD_TYPE not specified, setting to RelWithDebInfo because .git does NOT exist.")
+    set(default_build_type "RelWithDebInfo")
   endif()
+  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
+  STRING "BUILD_TYPE is ${default_build_type}, other options are: RelWithDebInfo, Release, and MinSizeRel." FORCE)
 endif()
+message(STATUS "BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
+set(CEPH_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(LINUX ON)

do_cmake.sh

@@ -105,13 +105,20 @@ EOF
 echo done.
 
 if [[ ! "$ARGS $@" =~ "-DCMAKE_BUILD_TYPE" ]]; then
-  cat <<EOF
-
+    if [ -d ../.git ]; then
+        printf "
 ****
-WARNING: do_cmake.sh now creates debug builds by default. Performance
-may be severely affected. Please use -DCMAKE_BUILD_TYPE=RelWithDebInfo
+WARNING: do_cmake.sh now creates debug builds by default if .git exists.
+Performance may be severely affected. Please use -DCMAKE_BUILD_TYPE=RelWithDebInfo
 if a performance sensitive build is required.
 ****
-EOF
+"
+    else
+        printf "
+****
+WARNING: do_cmake.sh now creates RelWithDebInfo builds by default when .git is absent.
+****
+"
+    fi
 fi
 

src/ceph_release.h.in.cmake

@@ -4,5 +4,6 @@
 #define CEPH_RELEASE @CEPH_RELEASE@
 #define CEPH_RELEASE_NAME "@CEPH_RELEASE_NAME@"
 #define CEPH_RELEASE_TYPE "@CEPH_RELEASE_TYPE@"
+#define CEPH_BUILD_TYPE "@CEPH_BUILD_TYPE@"
 
 #endif

src/common/version.cc

@@ -49,7 +49,8 @@ std::string const pretty_version_to_str(void)
   oss << "ceph version " << CEPH_GIT_NICE_VER
       << " (" << STRINGIFY(CEPH_GIT_VER) << ") "
       << ceph_release_name(CEPH_RELEASE)
-      << " (" << CEPH_RELEASE_TYPE << ")"
+      << " (" << CEPH_RELEASE_TYPE << " - "
+      << CEPH_BUILD_TYPE << ")"
 #ifdef WITH_CRIMSON
       << " (crimson)"
 #endif