Skip to content

Commit 392b1c8

Browse files
Improve message about used product families in CMake
Signed-off-by: Maciej Dziuban <[email protected]>
1 parent 5c6018b commit 392b1c8

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

platforms.cmake

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
set(MAX_GEN 64)
88

99
set(ALL_GEN_TYPES "")
10-
1110
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}/fill_gens.cmake)
1211

1312
set(ALL_GEN_TYPES_REVERSED ${ALL_GEN_TYPES})
@@ -166,6 +165,9 @@ macro(SET_FLAGS_FOR GEN_TYPE)
166165
endif()
167166

168167
if(SUPPORT_${GEN_TYPE})
168+
list(APPEND ALL_SUPPORTED_CORE_FAMILIES ${GEN_TYPE})
169+
list(REMOVE_DUPLICATES ALL_SUPPORTED_CORE_FAMILIES)
170+
169171
foreach(${GEN_TYPE}_PLATFORM ${ARGN})
170172
set(SUPPORT_${${GEN_TYPE}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${${GEN_TYPE}_PLATFORM}")
171173
if(TESTS_${GEN_TYPE})
@@ -176,6 +178,11 @@ macro(SET_FLAGS_FOR GEN_TYPE)
176178
endif()
177179
endforeach()
178180
endif()
181+
182+
if(TESTS_${GEN_TYPE})
183+
list(APPEND ALL_TESTED_CORE_FAMILIES ${GEN_TYPE})
184+
list(REMOVE_DUPLICATES ALL_TESTED_CORE_FAMILIES)
185+
endif()
179186
endmacro()
180187
macro(ADD_PLATFORM_FOR_GEN LIST_TYPE GEN_TYPE PLATFORM_NAME PLATFORM_TYPE)
181188
list(APPEND PLATFORM_TYPES ${PLATFORM_TYPE})
@@ -206,22 +213,21 @@ GET_AVAILABLE_PLATFORMS("TESTED" "TESTS" ALL_AVAILABLE_TESTED_PLATFORMS)
206213
GET_AVAILABLE_PRODUCTS("TESTED" ALL_PRODUCT_FAMILY_LIST DEFAULT_TESTED_PRODUCT_FAMILY)
207214
GET_AVAILABLE_PRODUCTS("SUPPORTED" ALL_PRODUCT_FAMILY_LIST DEFAULT_SUPPORTED_PRODUCT_FAMILY)
208215

216+
# Output platforms
209217
message(STATUS "All supported platforms: ${ALL_AVAILABLE_SUPPORTED_PLATFORMS}")
210218
message(STATUS "All tested platforms: ${ALL_AVAILABLE_TESTED_PLATFORMS}")
211-
212219
message(STATUS "Default supported platform: ${DEFAULT_SUPPORTED_PLATFORM}")
220+
message(STATUS "Default tested platform: ${DEFAULT_TESTED_PLATFORM}")
213221

214-
message(STATUS "All tested product families: ${ALL_TESTED_PRODUCT_FAMILY}")
215-
message(STATUS "All supported product families: ${ALL_SUPPORTED_PRODUCT_FAMILY}")
216-
message(STATUS "Default tested product family: ${DEFAULT_TESTED_PRODUCT_FAMILY}")
222+
# Output families
223+
message(STATUS "All supported core families: ${ALL_SUPPORTED_CORE_FAMILIES}")
224+
message(STATUS "All tested core families: ${ALL_TESTED_CORE_FAMILIES}")
217225

218226
list(FIND SUPPORTED_PLATFORM_LIST ${DEFAULT_SUPPORTED_PLATFORM} VALID_DEFAULT_SUPPORTED_PLATFORM)
219227
if(VALID_DEFAULT_SUPPORTED_PLATFORM LESS 0)
220228
message(FATAL_ERROR "Not a valid supported platform: ${DEFAULT_SUPPORTED_PLATFORM}")
221229
endif()
222230

223-
message(STATUS "Default tested platform: ${DEFAULT_TESTED_PLATFORM}")
224-
225231
if(DEFAULT_TESTED_PLATFORM)
226232
list(FIND TESTED_PLATFORM_LIST ${DEFAULT_TESTED_PLATFORM} VALID_DEFAULT_TESTED_PLATFORM)
227233
if(VALID_DEFAULT_TESTED_PLATFORM LESS 0)

0 commit comments

Comments
 (0)