executorch_print_configuration_summary

Author: jathu

CMakeLists.txt

@@ -49,6 +49,21 @@ project(executorch)
 
 include(${PROJECT_SOURCE_DIR}/tools/cmake/common/preset.cmake)
 
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+announce_configured_options(CMAKE_CXX_STANDARD)
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif()
+announce_configured_options(CMAKE_BUILD_TYPE)
+
+announce_configured_options(CMAKE_CXX_COMPILER_ID)
+announce_configured_options(CMAKE_TOOLCHAIN_FILE)
+announce_configured_options(BUCK2)
+announce_configured_options(PYTHON_EXECUTABLE)
+
 load_build_preset()
 include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/default.cmake)
 
@@ -63,14 +78,6 @@ include(ExternalProject)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-endif()
-
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
-endif()
-
 # Setup RPATH.
 # See https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
 # Use separate rpaths during build and install phases
@@ -710,6 +717,3 @@ if(EXECUTORCH_BUILD_VULKAN)
 endif()
 
 include(Test.cmake)
-
-# Print all summary
-executorch_print_configuration_summary()

examples/models/llama/CMakeLists.txt

@@ -222,6 +222,3 @@ target_include_directories(
 )
 target_link_libraries(llama_main PUBLIC llama_runner ${link_libraries})
 target_compile_options(llama_main PUBLIC ${_common_compile_options})
-
-# Print all summary
-executorch_print_configuration_summary()

examples/models/llava/CMakeLists.txt

@@ -208,6 +208,3 @@ endif()
 target_include_directories(llava_main PUBLIC ${_common_include_directories})
 target_link_libraries(llava_main PUBLIC llava_runner ${link_libraries})
 target_compile_options(llava_main PUBLIC ${_common_compile_options})
-
-# Print all summary
-executorch_print_configuration_summary()

examples/selective_build/CMakeLists.txt

@@ -135,6 +135,3 @@ target_link_libraries(
 )
 target_link_options_shared_lib(select_build_lib)
 target_compile_options(selective_build_test PUBLIC ${_common_compile_options})
-
-# Print all summary
-executorch_print_configuration_summary()

test/CMakeLists.txt

@@ -80,6 +80,3 @@ if(CMAKE_BUILD_TYPE EQUAL "Release")
   target_link_options(size_test_all_optimized_ops PRIVATE "LINKER:--gc-sections")
 endif()
 endif()
-
-# Print all summary
-executorch_print_configuration_summary()

tools/cmake/Utils.cmake

@@ -18,19 +18,6 @@
 # It should also be cmake-lint clean.
 #
 
-# Public function to print summary for all configurations. For new variables,
-# it's recommended to add them here.
-function(executorch_print_configuration_summary)
-  message(STATUS "")
-  message(STATUS "******** Summary ********")
-  message(STATUS "  CMAKE_BUILD_TYPE              : ${CMAKE_BUILD_TYPE}")
-  message(STATUS "  CMAKE_CXX_STANDARD            : ${CMAKE_CXX_STANDARD}")
-  message(STATUS "  CMAKE_CXX_COMPILER_ID         : ${CMAKE_CXX_COMPILER_ID}")
-  message(STATUS "  CMAKE_TOOLCHAIN_FILE          : ${CMAKE_TOOLCHAIN_FILE}")
-  message(STATUS "  BUCK2                         : ${BUCK2}")
-  message(STATUS "  PYTHON_EXECUTABLE             : ${PYTHON_EXECUTABLE}")
-endfunction()
-
 # This is the funtion to use -Wl, --whole-archive to link static library NB:
 # target_link_options is broken for this case, it only append the interface link
 # options of the first library.

tools/cmake/common/preset.cmake

@@ -48,7 +48,11 @@ function(print_configured_options)
       set(padding "${padding} ")
       math(EXPR num_spaces "${num_spaces} - 1")
     endwhile()
-    message(STATUS "${_option}${padding} : ${${_option}}")
+    if(DEFINED ${_option})
+      message(STATUS "${_option}${padding} : ${${_option}}")
+    else()
+      message(STATUS "${_option}${padding} x (unset)")
+    endif()
   endforeach()
   message(STATUS "---------------------------")
 endfunction()