diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2016-11-12 20:28:58 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2016-11-12 20:28:58 +0100 |
| commit | 7bd30b64fb5eaccb9c4a78b0bb4413d5a476089c (patch) | |
| tree | 7117963893e37acfd472a37591af211990eefccd /nrf5x | |
| parent | d6e6c587e9f5c599bae57a9a5532c6f9a108906a (diff) | |
| download | mcu.cmake-7bd30b64fb5eaccb9c4a78b0bb4413d5a476089c.tar.gz mcu.cmake-7bd30b64fb5eaccb9c4a78b0bb4413d5a476089c.tar.bz2 mcu.cmake-7bd30b64fb5eaccb9c4a78b0bb4413d5a476089c.tar.xz mcu.cmake-7bd30b64fb5eaccb9c4a78b0bb4413d5a476089c.zip | |
o Compatibility with SDK v12.1.0.
o Windows compatibility, the build works but haven't tested programming yet.
Diffstat (limited to 'nrf5x')
| -rw-r--r-- | nrf5x/utils.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nrf5x/utils.cmake b/nrf5x/utils.cmake index a583659..efd1f4d 100644 --- a/nrf5x/utils.cmake +++ b/nrf5x/utils.cmake @@ -106,9 +106,9 @@ function(mcu_add_executable) set_target_properties(${ARGS_TARGET} PROPERTIES SDK_CONFIG "${SDK_CONFIG}") if (ARGS_SOFTDEVICE) - if ("${MCU_NRF5X_SDK_VERSION}" VERSION_EQUAL 12 AND ARGS_SOFTDEVICE STREQUAL 130) + if ("${MCU_NRF5X_SDK_VERSION_MAJOR}" VERSION_EQUAL 12 AND ARGS_SOFTDEVICE STREQUAL 130) set(hex "${MCU_NRF5X_SDK_PATH}/components/softdevice/s130/hex/s130_nrf51_2.0.1_softdevice.hex") - elseif ("${MCU_NRF5X_SDK_VERSION}" VERSION_EQUAL 12 AND ARGS_SOFTDEVICE STREQUAL 132) + elseif ("${MCU_NRF5X_SDK_VERSION_MAJOR}" STREQUAL 12 AND ARGS_SOFTDEVICE STREQUAL 132) set(hex "${MCU_NRF5X_SDK_PATH}/components/softdevice/s132/hex/s132_nrf52_3.0.0_softdevice.hex") else () message(WARNING "Unknown combination of SDK version (${MCU_NRF5X_SDK_VERSION}) and softdevice (${ARGS_SOFTDEVICE}). Some features might be unavailable.") @@ -192,8 +192,8 @@ function(_nrf5_set_from_main_target T) endif () target_link_libraries(${T} PUBLIC - -L${MCU_NRF5X_SDK_PATH}/components/toolchain/gcc - -T$<TARGET_PROPERTY:MCU_LINKER_SCRIPT>) + "-L\"${MCU_NRF5X_SDK_PATH}/components/toolchain/gcc\"" + "-T\"$<TARGET_PROPERTY:MCU_LINKER_SCRIPT>\"") endfunction() function(_nrf_chip_values INCLUDES_VAR DEFINES_VAR) |