Merge pull request #60 from sensics/improve-source-finding

Improve source finding

cmake/FindCMSIS.cmake

@@ -115,23 +115,24 @@ SET(CMSIS_INCLUDE_DIRS
 )
 
 FOREACH(SRC ${CMSIS_DEVICE_SOURCES})
-    SET(SRC_FILE SRC_FILE-NOTFOUND)
-    FIND_FILE(SRC_FILE ${SRC}
+    STRING(MAKE_C_IDENTIFIER "${SRC}" SRC_CLEAN)
+    SET(CMSIS_${SRC_CLEAN}_FILE SRC_FILE-NOTFOUND)
+    FIND_FILE(CMSIS_${SRC_CLEAN}_FILE ${SRC}
         PATH_SUFFIXES src stm32${STM32_FAMILY_LOWER} cmsis
         HINTS ${STM32Cube_DIR}/Drivers/CMSIS/Device/ST/STM32${STM32_FAMILY}xx/Source/Templates/
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    LIST(APPEND CMSIS_SOURCES ${SRC_FILE})
+    LIST(APPEND CMSIS_SOURCES ${CMSIS_${SRC_CLEAN}_FILE})
 ENDFOREACH()
 
 IF(STM32_CHIP_TYPE)
-    SET(SRC_FILE SRC_FILE-NOTFOUND)
-    FIND_FILE(SRC_FILE ${CMSIS_STARTUP_SOURCE}
+    SET(CMSIS_STARTUP_SOURCE_FILE SRC_FILE-NOTFOUND)
+    FIND_FILE(CMSIS_STARTUP_SOURCE_FILE ${CMSIS_STARTUP_SOURCE}
         PATH_SUFFIXES src stm32${STM32_FAMILY_LOWER} cmsis
         HINTS ${STM32Cube_DIR}/Drivers/CMSIS/Device/ST/STM32${STM32_FAMILY}xx/Source/Templates/gcc/
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    LIST(APPEND CMSIS_SOURCES ${SRC_FILE})
+    LIST(APPEND CMSIS_SOURCES ${CMSIS_STARTUP_SOURCE_FILE})
 ENDIF()
 
 INCLUDE(FindPackageHandleStandardArgs)

cmake/FindSTM32HAL.cmake

@@ -205,13 +205,14 @@ FIND_PATH(STM32HAL_INCLUDE_DIR ${HAL_HEADERS}
 )
 
 FOREACH(HAL_SRC ${HAL_SRCS})
-    SET(HAL_${HAL_SRC}_FILE HAL_SRC_FILE-NOTFOUND)
-    FIND_FILE(HAL_${HAL_SRC}_FILE ${HAL_SRC}
+    STRING(MAKE_C_IDENTIFIER "${HAL_SRC}" HAL_SRC_CLEAN)
+    SET(HAL_${HAL_SRC_CLEAN}_FILE HAL_SRC_FILE-NOTFOUND)
+    FIND_FILE(HAL_${HAL_SRC_CLEAN}_FILE ${HAL_SRC}
         PATH_SUFFIXES src stm32${STM32_FAMILY_LOWER}
         HINTS ${STM32Cube_DIR}/Drivers/STM32${STM32_FAMILY}xx_HAL_Driver/Src
         CMAKE_FIND_ROOT_PATH_BOTH
     )
-    LIST(APPEND STM32HAL_SOURCES ${HAL_${HAL_SRC}_FILE})
+    LIST(APPEND STM32HAL_SOURCES ${HAL_${HAL_SRC_CLEAN}_FILE})
 ENDFOREACH()
 
 INCLUDE(FindPackageHandleStandardArgs)