Skip to content

Commit 01acb7a

Browse files
TankedThomasTankedThomas
committed
Fix variable pathname spacing
Signed-off-by: TankedThomas <[email protected]>
1 parent 4d9cd90 commit 01acb7a

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎portable/ThirdParty/GCC/RP2040/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ if (NOT TARGET _FreeRTOS_kernel_inclusion_marker)
1010
endif()
1111

1212
if (NOT FREERTOS_KERNEL_PATH)
13-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../.. REALPATH)
13+
get_filename_component(FREERTOS_KERNEL_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../.." REALPATH)
1414
endif ()
1515

16-
message(DEBUG "FREERTOS_KERNEL_PATH is ${FREERTOS_KERNEL_PATH}")
16+
message(DEBUG "FREERTOS_KERNEL_PATH is '${FREERTOS_KERNEL_PATH}'")
1717
project(FreeRTOS-Kernel C CXX)
1818

1919
set(CMAKE_C_STANDARD 11)
@@ -28,23 +28,23 @@ if (NOT TARGET _FreeRTOS_kernel_inclusion_marker)
2828
if (PICO_SDK_VERSION_STRING VERSION_LESS "1.3.2")
2929
message(FATAL_ERROR "Require at least Raspberry Pi Pico SDK version 1.3.2 to include FreeRTOS after pico_sdk_init()")
3030
endif()
31-
include(${CMAKE_CURRENT_LIST_DIR}/library.cmake)
31+
include("${CMAKE_CURRENT_LIST_DIR}/library.cmake")
3232
else()
3333
# The real work gets done in library.cmake which is called at the end of pico_sdk_init
34-
list(APPEND PICO_SDK_POST_LIST_FILES ${CMAKE_CURRENT_LIST_DIR}/library.cmake)
34+
list(APPEND PICO_SDK_POST_LIST_FILES "${CMAKE_CURRENT_LIST_DIR}/library.cmake")
3535
if (PICO_SDK_VERSION_STRING VERSION_LESS "1.3.2")
3636
# We need to inject the following header file into ALL SDK files (which we do via the config header)
37-
list(APPEND PICO_CONFIG_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/include/freertos_sdk_config.h)
37+
list(APPEND PICO_CONFIG_HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/include/freertos_sdk_config.h")
3838
endif()
3939

4040
if (FREERTOS_KERNEL_TOP_LEVEL_PROJECT)
4141
message("FreeRTOS: initialize SDK since we're the top-level")
4242
# Initialize the SDK
4343
pico_sdk_init()
4444
else()
45-
set(FREERTOS_KERNEL_PATH ${FREERTOS_KERNEL_PATH} PARENT_SCOPE)
46-
set(PICO_CONFIG_HEADER_FILES ${PICO_CONFIG_HEADER_FILES} PARENT_SCOPE)
47-
set(PICO_SDK_POST_LIST_FILES ${PICO_SDK_POST_LIST_FILES} PARENT_SCOPE)
45+
set(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" PARENT_SCOPE)
46+
set(PICO_CONFIG_HEADER_FILES "${PICO_CONFIG_HEADER_FILES}" PARENT_SCOPE)
47+
set(PICO_SDK_POST_LIST_FILES "${PICO_SDK_POST_LIST_FILES}" PARENT_SCOPE)
4848
endif()
4949
endif()
5050
endif()

‎portable/ThirdParty/GCC/RP2040/FreeRTOS_Kernel_import.cmake‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# respectively.
77

88
if (DEFINED ENV{FREERTOS_KERNEL_PATH} AND (NOT FREERTOS_KERNEL_PATH))
9-
set(FREERTOS_KERNEL_PATH $ENV{FREERTOS_KERNEL_PATH})
9+
set(FREERTOS_KERNEL_PATH "$ENV{FREERTOS_KERNEL_PATH}")
1010
message("Using FREERTOS_KERNEL_PATH from environment ('${FREERTOS_KERNEL_PATH}')")
1111
endif ()
1212

@@ -33,29 +33,29 @@ foreach(SEARCH_PASS RANGE 0 1)
3333

3434
if (NOT FREERTOS_KERNEL_PATH)
3535
# check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly)
36-
get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH)
37-
get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH)
36+
get_filename_component(_ACTUAL_PATH "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
37+
get_filename_component(_POSSIBLE_PATH "${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}" REALPATH)
3838
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
39-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
39+
get_filename_component(FREERTOS_KERNEL_PATH "${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}" REALPATH)
4040
endif()
4141
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
42-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
43-
message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake")
42+
get_filename_component(FREERTOS_KERNEL_PATH "${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}" REALPATH)
43+
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' based on location of FreeRTOS-Kernel-import.cmake")
4444
break()
4545
elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
46-
set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel)
47-
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}")
46+
set(FREERTOS_KERNEL_PATH "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
47+
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: '${FREERTOS_KERNEL_PATH}'")
4848
break()
4949
endif()
5050
endif ()
5151

5252
if (NOT FREERTOS_KERNEL_PATH)
5353
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
5454
# check if FreeRTOS-Kernel exists under directory that included us
55-
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
56-
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
57-
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
58-
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)
55+
set(SEARCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
56+
get_filename_component(_POSSIBLE_PATH "${SEARCH_ROOT}/${POSSIBLE_SUFFIX}" REALPATH)
57+
if (EXISTS "${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt")
58+
get_filename_component(FREERTOS_KERNEL_PATH "${_POSSIBLE_PATH}" REALPATH)
5959
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project")
6060
break()
6161
endif()
@@ -80,12 +80,12 @@ endif()
8080
set(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" CACHE PATH "Path to the FreeRTOS Kernel")
8181

8282
get_filename_component(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
83-
if (NOT EXISTS ${FREERTOS_KERNEL_PATH})
83+
if (NOT EXISTS "${FREERTOS_KERNEL_PATH}")
8484
message(FATAL_ERROR "Directory '${FREERTOS_KERNEL_PATH}' not found")
8585
endif()
86-
if (NOT EXISTS ${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
87-
message(FATAL_ERROR "Directory '${FREERTOS_KERNEL_PATH}' does not contain a '${PICO_PLATFORM}' port here: ${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}")
86+
if (NOT EXISTS "${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt")
87+
message(FATAL_ERROR "Directory '${FREERTOS_KERNEL_PATH}' does not contain a '${PICO_PLATFORM}' port here: '${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}'")
8888
endif()
89-
set(FREERTOS_KERNEL_PATH ${FREERTOS_KERNEL_PATH} CACHE PATH "Path to the FreeRTOS_KERNEL" FORCE)
89+
set(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" CACHE PATH "Path to the FreeRTOS_KERNEL" FORCE)
9090

91-
add_subdirectory(${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} FREERTOS_KERNEL)
91+
add_subdirectory("${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}" FREERTOS_KERNEL)

‎portable/ThirdParty/GCC/RP2040/pico_sdk_import.cmake‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# It should be include()ed prior to project()
99

1010
if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH))
11-
set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})
11+
set(PICO_SDK_PATH "$ENV{PICO_SDK_PATH}")
1212
message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')")
1313
endif ()
1414

@@ -18,7 +18,7 @@ if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT} AND (NOT PICO_SDK_FETCH_FROM_GIT))
1818
endif ()
1919

2020
if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_PATH))
21-
set(PICO_SDK_FETCH_FROM_GIT_PATH $ENV{PICO_SDK_FETCH_FROM_GIT_PATH})
21+
set(PICO_SDK_FETCH_FROM_GIT_PATH "$ENV{PICO_SDK_FETCH_FROM_GIT_PATH}")
2222
message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
2323
endif ()
2424

@@ -29,7 +29,7 @@ set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPAT
2929
if (NOT PICO_SDK_PATH)
3030
if (PICO_SDK_FETCH_FROM_GIT)
3131
include(FetchContent)
32-
set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR})
32+
set(FETCHCONTENT_BASE_DIR_SAVE "${FETCHCONTENT_BASE_DIR}")
3333
if (PICO_SDK_FETCH_FROM_GIT_PATH)
3434
get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
3535
endif ()
@@ -41,9 +41,9 @@ if (NOT PICO_SDK_PATH)
4141
if (NOT pico_sdk)
4242
message("Downloading Raspberry Pi Pico SDK")
4343
FetchContent_Populate(pico_sdk)
44-
set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR})
44+
set(PICO_SDK_PATH "${pico_sdk_SOURCE_DIR}")
4545
endif ()
46-
set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
46+
set(FETCHCONTENT_BASE_DIR "${FETCHCONTENT_BASE_DIR_SAVE}")
4747
else ()
4848
message(FATAL_ERROR
4949
"SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git."
@@ -52,15 +52,15 @@ if (NOT PICO_SDK_PATH)
5252
endif ()
5353

5454
get_filename_component(PICO_SDK_PATH "${PICO_SDK_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
55-
if (NOT EXISTS ${PICO_SDK_PATH})
55+
if (NOT EXISTS "${PICO_SDK_PATH}")
5656
message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' not found")
5757
endif ()
5858

59-
set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake)
60-
if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE})
59+
set(PICO_SDK_INIT_CMAKE_FILE "${PICO_SDK_PATH}/pico_sdk_init.cmake")
60+
if (NOT EXISTS "${PICO_SDK_INIT_CMAKE_FILE}")
6161
message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the Raspberry Pi Pico SDK")
6262
endif ()
6363

64-
set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE)
64+
set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE)
6565

66-
include(${PICO_SDK_INIT_CMAKE_FILE})
66+
include("${PICO_SDK_INIT_CMAKE_FILE}")

0 commit comments

Comments
 (0)