Explorar o código

Update cmake/stm32/common.cmake

Co-authored-by: Julien Staub <atsju2@yahoo.fr>
Spacefish %!s(int64=4) %!d(string=hai) anos
pai
achega
2081093a13
Modificáronse 1 ficheiros con 5 adicións e 7 borrados
  1. 5 7
      cmake/stm32/common.cmake

+ 5 - 7
cmake/stm32/common.cmake

@@ -10,13 +10,12 @@ foreach(FAMILY ${STM32_SUPPORTED_FAMILIES_LONG_NAME})
 endforeach()
 endforeach()
 list(REMOVE_DUPLICATES STM32_SUPPORTED_FAMILIES_SHORT_NAME)
 list(REMOVE_DUPLICATES STM32_SUPPORTED_FAMILIES_SHORT_NAME)
 
 
-if(DEFINED ENV{STM32_TOOLCHAIN_PATH})
-    message(STATUS "Detected toolchain path STM32_TOOLCHAIN_PATH in environmental variables: ")
-    message(STATUS "$ENV{STM32_TOOLCHAIN_PATH}")
-    set(STM32_TOOLCHAIN_PATH $ENV{STM32_TOOLCHAIN_PATH})
-endif()
-
 if(NOT STM32_TOOLCHAIN_PATH)
 if(NOT STM32_TOOLCHAIN_PATH)
+    if(DEFINED ENV{STM32_TOOLCHAIN_PATH})
+        message(STATUS "Detected toolchain path STM32_TOOLCHAIN_PATH in environmental variables: ")
+        message(STATUS "$ENV{STM32_TOOLCHAIN_PATH}")
+        set(STM32_TOOLCHAIN_PATH $ENV{STM32_TOOLCHAIN_PATH})
+    endif()
     if(NOT CMAKE_C_COMPILER)
     if(NOT CMAKE_C_COMPILER)
         set(STM32_TOOLCHAIN_PATH "/usr")
         set(STM32_TOOLCHAIN_PATH "/usr")
         message(STATUS "No STM32_TOOLCHAIN_PATH specified, using default: " ${STM32_TOOLCHAIN_PATH})
         message(STATUS "No STM32_TOOLCHAIN_PATH specified, using default: " ${STM32_TOOLCHAIN_PATH})
@@ -319,4 +318,3 @@ include(stm32/l0)
 include(stm32/l1)
 include(stm32/l1)
 include(stm32/l4)
 include(stm32/l4)
 include(stm32/l5)
 include(stm32/l5)
-