Skip to content

AMDB autogen ordering #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quic-aditrath wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AMDB autogen ordering #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16bb72b
CMake: Fix AMDB autogen config generation order.
quic-aditrath Jan 27, 2026
ec3432d
AMDB: CMake: Replace GLOB_RECURSE with autogen sources file list.
quic-aditrath Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,30 +173,6 @@ else()
add_library(spf SHARED "" )
endif()

message (STATUS "Generating AMDB configs")

# Execute before amdb target is configured as amdb target uses generated
# ouput files from spf_libs_config_parser.py execution.
execute_process(
COMMAND ${CMAKE_COMMAND} -E env
BUILDPATH=""
OPENSRC="y"
PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR}
PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}
CHIPSET=${SPF_CHIPSET}
TGT_SPECIFIC_FOLDER=${TGT_SPECIFIC_FOLDER}
TIMESTAMP=${SPF_TIME_STAMP}
ARCH=${ARCH}
AR_VERSION=${AR_VERSION}
AR_MAJOR_VERSION=${AR_MAJOR_VERSION}
AR_MINOR_VERSION=${AR_MINOR_VERSION}
AR_PATCHLEVEL=${AR_PATCHLEVEL}
${PYTHON3} ${PROJECT_SOURCE_DIR}/scripts/spf/spf_libs_config_parser.py -c ${SPF_CHIPSET} -f "GEN_SHARED_LIBS,AVS_TEST"
RESULTS_VARIABLE AMDB_AUTOGEN_OUTPUT
)

message(STATUS "AMDB config generation result: ${AMDB_AUTOGEN_OUTPUT}")

add_custom_target(
menuconfig
COMMAND ${CMAKE_COMMAND} -E env
Expand All @@ -219,6 +195,29 @@ add_compile_definitions(AMDB_REG_SPF_MODULES)
add_subdirectory(fwk/build)
add_subdirectory(modules)

message (STATUS "Generating AMDB configs")

# Note: Need to explicitely list AMDB autogen configuration files in AMDB CMake.
execute_process(
COMMAND ${CMAKE_COMMAND} -E env
BUILDPATH=""
OPENSRC="y"
PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR}
PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}
CHIPSET=${SPF_CHIPSET}
TGT_SPECIFIC_FOLDER=${TGT_SPECIFIC_FOLDER}
TIMESTAMP=${SPF_TIME_STAMP}
ARCH=${ARCH}
AR_VERSION=${AR_VERSION}
AR_MAJOR_VERSION=${AR_MAJOR_VERSION}
AR_MINOR_VERSION=${AR_MINOR_VERSION}
AR_PATCHLEVEL=${AR_PATCHLEVEL}
${PYTHON3} ${PROJECT_SOURCE_DIR}/scripts/spf/spf_libs_config_parser.py -c ${SPF_CHIPSET} -f "GEN_SHARED_LIBS,AVS_TEST"
RESULTS_VARIABLE AMDB_AUTOGEN_OUTPUT
)

message(STATUS "AMDB config generation result: ${AMDB_AUTOGEN_OUTPUT}")

#Read the list of libraries that were added using the global property
get_property(spf_static_libs GLOBAL PROPERTY GLOBAL_SPF_LIBS_LIST)

Expand Down
8 changes: 7 additions & 1 deletion fwk/spf/amdb/build/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ set (lib_incs_list

#Add the auto-generated source files
set(AUTO_GENERATE_DIR ${LIB_ROOT}/autogen/${TGT_SPECIFIC_FOLDER}/)
file(GLOB_RECURSE amdb_autogen_SOURCES CONFIGURE_DEPENDS ${AUTO_GENERATE_DIR}/*.c)

set(amdb_autogen_SOURCES
${AUTO_GENERATE_DIR}/spf_static_build_config.c
${AUTO_GENERATE_DIR}/spf_shared_build_config.c
${AUTO_GENERATE_DIR}/spf_static_build_config_private.c
${AUTO_GENERATE_DIR}/spf_shared_build_config_private.c
)

#Add the core source files
set (lib_srcs_list
Expand Down
Loading