Просмотр исходного кода

Fix some bugs in FindChibios.cmake

Konstantin Oblaukhov 11 лет назад
Родитель
Сommit
012392251f
1 измененных файлов с 7 добавлено и 5 удалено
  1. 7 5
      cmake/Modules/FindChibiOS.cmake

+ 7 - 5
cmake/Modules/FindChibiOS.cmake

@@ -196,9 +196,7 @@ IF(STM32_FAMILY STREQUAL "F4")
             MESSAGE(STATUS "ChibiOS doesn't have linker script for your chip, please specify it directly using ChibiOS_LINKER_SCRIPT variable.")
         ENDIF()
     ENDIF()
-    
-    SET(CHIBIOS_${module}_PLATFORM_SEARCH_PATH ${CHIBIOS_ext_PLATFORM_SEARCH_PATH} ${CHIBIOS_ROOT}/os/hal/platforms/STM32F4xx)
-    
+      
 ELSEIF(STM32_FAMILY STREQUAL "F1")
     
     SET(CHIBIOS_kernel_PLATFORM_SEARCH_PATH 
@@ -272,8 +270,6 @@ ELSEIF(STM32_FAMILY STREQUAL "F1")
             ENDIF()
         ENDIF()
     ENDIF()            
-    
-    SET(CHIBIOS_${module}_PLATFORM_SEARCH_PATH ${CHIBIOS_ext_PLATFORM_SEARCH_PATH} ${CHIBIOS_ROOT}/os/hal/platforms/STM32F1xx)
 ENDIF()
 
 IF(NOT ChibiOS_LINKER_SCRIPT)
@@ -296,6 +292,12 @@ FOREACH(module ${CHIBIOS_HAL_LLD_MODULES})
     MATH(EXPR INDEX "${INDEX} + 1")
 ENDFOREACH()
 
+IF(STM32_FAMILY STREQUAL "F4")
+    SET(CHIBIOS_ext_PLATFORM_SEARCH_PATH ${CHIBIOS_ext_PLATFORM_SEARCH_PATH} ${CHIBIOS_ROOT}/os/hal/platforms/STM32F4xx)
+ELSEIF(STM32_FAMILY STREQUAL "F1")
+    SET(CHIBIOS_ext_PLATFORM_SEARCH_PATH ${CHIBIOS_ext_PLATFORM_SEARCH_PATH} ${CHIBIOS_ROOT}/os/hal/platforms/STM32F1xx)
+ENDIF()
+
 FOREACH(comp ${ChibiOS_FIND_COMPONENTS}) 
     LIST(FIND CHIBIOS_COMPONENTS ${comp} INDEX)
     IF(INDEX EQUAL -1)