Skip to content
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

Fix buggy globbing rules in addon build #10076

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Fix buggy globbing rules in addon build #10076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions scripts/cmake/addons.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ function(add_addon_target NAME)

# Scan for addon manifests if a source directory was provided.
if(ADDON_SOURCE_DIR)
file(GLOB_RECURSE SCANNED_MANIFEST_FILES CONFIGURE_DEPENDS ${ADDON_SOURCE_DIR}/manifest.json)
file(GLOB_RECURSE SCANNED_MANIFEST_FILES
CONFIGURE_DEPENDS
${ADDON_SOURCE_DIR}/*/manifest.json)

foreach(FILENAME ${SCANNED_MANIFEST_FILES})
if(${FILENAME} MATCHES "generated")
continue()
Expand All @@ -52,8 +55,8 @@ function(add_addon_target NAME)
# Add commands to build the addons
foreach(MANIFEST_FILE ${ADDON_SOURCES})
# Parse the manifest to get the addon ID.
execute_process(OUTPUT_VARIABLE ADDON_ID OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND ${PYTHON_EXECUTABLE} -c "import json; print(json.load(open('${MANIFEST_FILE}', encoding='utf-8'))['id'])")
file(READ ${MANIFEST_FILE} MANIFEST_JSON)
string(JSON ADDON_ID GET "${MANIFEST_JSON}" "id")

if((CMAKE_GENERATOR MATCHES "Ninja") OR (CMAKE_GENERATOR MATCHES "Makefiles"))
## Depfiles are great, but they only work for some generators.
Expand Down
20 changes: 10 additions & 10 deletions tests/functional/addons/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ project(testing_addons VERSION 1.0.0 LANGUAGES CXX
find_program(PYTHON_EXECUTABLE NAMES python3 python)
find_package(Qt6 REQUIRED COMPONENTS Core Qml)

include(${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/cmake/addons.cmake)
include(${CMAKE_SOURCE_DIR}/scripts/cmake/addons.cmake)

# Build the production addons.
add_addon_target(prod_addon
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/prod/
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../addons/
I18N_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/i18n
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/prod
SOURCE_DIR ${CMAKE_SOURCE_DIR}/addons
I18N_DIR ${CMAKE_SOURCE_DIR}/3rdparty/i18n
)
set_target_properties(prod_addon PROPERTIES EXCLUDE_FROM_ALL FALSE)

# Build the addons for testing.
add_custom_target(test_01_empty_manifest
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/01_empty_manifest/
${CMAKE_CURRENT_BINARY_DIR}/01_empty_manifest/
${CMAKE_CURRENT_SOURCE_DIR}/01_empty_manifest
${CMAKE_CURRENT_BINARY_DIR}/01_empty_manifest
)
set_target_properties(test_01_empty_manifest PROPERTIES EXCLUDE_FROM_ALL FALSE)

Expand All @@ -37,13 +37,13 @@ add_custom_target(test_02_broken_manifest
set_target_properties(test_02_broken_manifest PROPERTIES EXCLUDE_FROM_ALL FALSE)

add_addon_target(test_03_single_addon
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/03_single_addon/
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/03_single_addon/
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/03_single_addon
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/03_single_addon
)
set_target_properties(test_03_single_addon PROPERTIES EXCLUDE_FROM_ALL FALSE)

add_addon_target(test_08_message_disabled
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/08_message_disabled/
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/08_message_disabled/
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/08_message_disabled
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/08_message_disabled
)
set_target_properties(test_08_message_disabled PROPERTIES EXCLUDE_FROM_ALL FALSE)
Loading