Detect release builds by comparing CMAKE_BUILD_TYPE to Debug, not Release (#12045)

MinSizeRel and RelWithDebInfo are also release builds.

Author: swolchok

CMakeLists.txt

@@ -705,7 +705,7 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
   endif()
 
   add_executable(executor_runner ${_executor_runner__srcs})
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     if(APPLE)
       target_link_options(executor_runner PRIVATE "LINKER:-dead_strip")
     else()

backends/qualcomm/CMakeLists.txt

@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   add_link_options("-flto=auto")
 endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   # strip symbols
   add_link_options("-s")
 
@@ -259,7 +259,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
     pybind11_strip(PyQnnWrapperAdaptor)
   endif()
 
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     # need to allow exceptions in pybind
     set(_pybind_compile_options -Wno-deprecated-declarations -fPIC -frtti
                                 -fexceptions

examples/models/llama/CMakeLists.txt

@@ -209,7 +209,7 @@ if(ANDROID)
 endif()
 
 add_executable(llama_main ${_srcs})
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   if(APPLE)
     target_link_options(llama_main PRIVATE "LINKER:-dead_strip")
   else()

examples/models/llava/CMakeLists.txt

@@ -197,7 +197,7 @@ list(APPEND _common_include_directories ${stb_SOURCE_DIR}
 )
 
 add_executable(llava_main ${_srcs})
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   if(APPLE)
     target_link_options(llava_main PRIVATE "LINKER:-dead_strip,-s")
   else()

examples/selective_build/CMakeLists.txt

@@ -151,7 +151,7 @@ list(TRANSFORM _executor_runner__srcs PREPEND "${EXECUTORCH_ROOT}/")
 # link to
 #
 add_executable(selective_build_test ${_executor_runner__srcs})
-if(CMAKE_BUILD_TYPE EQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_link_options(selective_build_test PRIVATE "LINKER:--gc-sections")
 endif()
 target_link_libraries(

test/CMakeLists.txt

@@ -52,7 +52,7 @@ list(TRANSFORM _size_test__srcs PREPEND "${EXECUTORCH_ROOT}/")
 # when we cross compile to ios
 add_executable(size_test ${_size_test__srcs})
 target_link_libraries(size_test executorch)
-if(CMAKE_BUILD_TYPE EQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_link_options(size_test PRIVATE "LINKER:--gc-sections")
 endif()
 
@@ -64,7 +64,7 @@ target_link_options_shared_lib(portable_ops_lib)
 target_link_libraries(
   size_test_all_ops executorch portable_ops_lib portable_kernels
 )
-if(CMAKE_BUILD_TYPE EQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_link_options(size_test_all_ops PRIVATE "LINKER:--gc-sections")
 endif()
 
@@ -76,7 +76,7 @@ add_executable(size_test_all_optimized_ops ${_size_test__srcs})
 target_link_options_shared_lib(optimized_native_cpu_ops_lib)
 target_link_libraries(
   size_test_all_optimized_ops executorch optimized_native_cpu_ops_lib)
-if(CMAKE_BUILD_TYPE EQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_link_options(size_test_all_optimized_ops PRIVATE "LINKER:--gc-sections")
 endif()
 endif()

tools/cmake/preset/default.cmake

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(_is_build_type_release ON)
   set(_is_build_type_debug OFF)
 else()