Skip to content

Commit 6a9157e

Browse files
committed
executorch_print_configuration_summary
1 parent f8e7264 commit 6a9157e

File tree

7 files changed

+20
-37
lines changed

7 files changed

+20
-37
lines changed

CMakeLists.txt

+15-11
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,21 @@ project(executorch)
4949

5050
include(${PROJECT_SOURCE_DIR}/tools/cmake/common/preset.cmake)
5151

52+
if(NOT CMAKE_CXX_STANDARD)
53+
set(CMAKE_CXX_STANDARD 17)
54+
endif()
55+
announce_configured_options(CMAKE_CXX_STANDARD)
56+
57+
if(NOT CMAKE_BUILD_TYPE)
58+
set(CMAKE_BUILD_TYPE Debug)
59+
endif()
60+
announce_configured_options(CMAKE_BUILD_TYPE)
61+
62+
announce_configured_options(CMAKE_CXX_COMPILER_ID)
63+
announce_configured_options(CMAKE_TOOLCHAIN_FILE)
64+
announce_configured_options(BUCK2)
65+
announce_configured_options(PYTHON_EXECUTABLE)
66+
5267
load_build_preset()
5368
include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/default.cmake)
5469

@@ -63,14 +78,6 @@ include(ExternalProject)
6378

6479
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
6580

66-
if(NOT CMAKE_CXX_STANDARD)
67-
set(CMAKE_CXX_STANDARD 17)
68-
endif()
69-
70-
if(NOT CMAKE_BUILD_TYPE)
71-
set(CMAKE_BUILD_TYPE Debug)
72-
endif()
73-
7481
# Setup RPATH.
7582
# See https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
7683
# Use separate rpaths during build and install phases
@@ -712,6 +719,3 @@ if(EXECUTORCH_BUILD_VULKAN)
712719
endif()
713720

714721
include(Test.cmake)
715-
716-
# Print all summary
717-
executorch_print_configuration_summary()

examples/models/llama/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,3 @@ target_include_directories(
222222
)
223223
target_link_libraries(llama_main PUBLIC llama_runner ${link_libraries})
224224
target_compile_options(llama_main PUBLIC ${_common_compile_options})
225-
226-
# Print all summary
227-
executorch_print_configuration_summary()

examples/models/llava/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,3 @@ endif()
208208
target_include_directories(llava_main PUBLIC ${_common_include_directories})
209209
target_link_libraries(llava_main PUBLIC llava_runner ${link_libraries})
210210
target_compile_options(llava_main PUBLIC ${_common_compile_options})
211-
212-
# Print all summary
213-
executorch_print_configuration_summary()

examples/selective_build/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,3 @@ target_link_libraries(
135135
)
136136
target_link_options_shared_lib(select_build_lib)
137137
target_compile_options(selective_build_test PUBLIC ${_common_compile_options})
138-
139-
# Print all summary
140-
executorch_print_configuration_summary()

test/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,3 @@ if(CMAKE_BUILD_TYPE EQUAL "Release")
8080
target_link_options(size_test_all_optimized_ops PRIVATE "LINKER:--gc-sections")
8181
endif()
8282
endif()
83-
84-
# Print all summary
85-
executorch_print_configuration_summary()

tools/cmake/Utils.cmake

-13
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@
1818
# It should also be cmake-lint clean.
1919
#
2020

21-
# Public function to print summary for all configurations. For new variables,
22-
# it's recommended to add them here.
23-
function(executorch_print_configuration_summary)
24-
message(STATUS "")
25-
message(STATUS "******** Summary ********")
26-
message(STATUS " CMAKE_BUILD_TYPE : ${CMAKE_BUILD_TYPE}")
27-
message(STATUS " CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
28-
message(STATUS " CMAKE_CXX_COMPILER_ID : ${CMAKE_CXX_COMPILER_ID}")
29-
message(STATUS " CMAKE_TOOLCHAIN_FILE : ${CMAKE_TOOLCHAIN_FILE}")
30-
message(STATUS " BUCK2 : ${BUCK2}")
31-
message(STATUS " PYTHON_EXECUTABLE : ${PYTHON_EXECUTABLE}")
32-
endfunction()
33-
3421
# This is the funtion to use -Wl, --whole-archive to link static library NB:
3522
# target_link_options is broken for this case, it only append the interface link
3623
# options of the first library.

tools/cmake/common/preset.cmake

+5-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ function(print_configured_options)
4848
set(padding "${padding} ")
4949
math(EXPR num_spaces "${num_spaces} - 1")
5050
endwhile()
51-
message(STATUS "${_option}${padding} : ${${_option}}")
51+
if(DEFINED ${_option})
52+
message(STATUS "${_option}${padding} : ${${_option}}")
53+
else()
54+
message(STATUS "${_option}${padding} x (unset)")
55+
endif()
5256
endforeach()
5357
message(STATUS "---------------------------")
5458
endfunction()

0 commit comments

Comments
 (0)