Skip to content

Commit 23b26cc

Browse files
Oops use namespace
1 parent b4ac16b commit 23b26cc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tools/cmake/mbed_generate_configuration.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake)
3434
set(MBED_NEED_TO_RECONFIGURE TRUE)
3535
endif()
3636
else()
37-
# Include the old version of mbed_config.cmake to get the CONFIG_JSON_SOURCE_FILES variable used below
37+
# Include the old version of mbed_config.cmake to get the MBED_CONFIG_JSON_SOURCE_FILES variable used below
3838
include(${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake)
3939
endif()
4040

4141
# Check timestamps on all JSON files used to generate the Mbed configuration
4242
if(NOT MBED_NEED_TO_RECONFIGURE)
4343
file(TIMESTAMP ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake MBED_CONFIG_CMAKE_TIMESTAMP "%s" UTC)
4444

45-
foreach(CONFIG_JSON ${CONFIG_JSON_SOURCE_FILES})
45+
foreach(CONFIG_JSON ${MBED_CONFIG_JSON_SOURCE_FILES})
4646
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/${CONFIG_JSON})
4747
message(STATUS "Mbed: ${CONFIG_JSON} deleted or renamed, regenerating configs...")
4848
set(MBED_NEED_TO_RECONFIGURE TRUE)
@@ -113,4 +113,4 @@ endif()
113113
include(${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake)
114114

115115
# Make it so that if any config JSON files are modified, CMake is rerun.
116-
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CONFIG_JSON_SOURCE_FILES})
116+
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MBED_CONFIG_JSON_SOURCE_FILES})

tools/python/mbed_tools/build/_internal/templates/mbed_config.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(MBED_GREENTEA_TEST_RESET_TIMEOUT "{{forced_reset_timeout}}")
1515

1616
# JSON files used to generate this config. If any of these change, the Python config generation
1717
# scripts must be rerun.
18-
set(CONFIG_JSON_SOURCE_FILES {% for json_source in json_sources | sort %}
18+
set(MBED_CONFIG_JSON_SOURCE_FILES {% for json_source in json_sources | sort %}
1919
"{{json_source.as_posix()}}"
2020
{%- endfor %}
2121
)

0 commit comments

Comments
 (0)