Merge pull request #5 from nknotts/master

Added ability to specify additional search path

README.mediawiki

@@ -38,7 +38,7 @@ In stdperiph folder
  make && make install
 '''Note:''' For building for STM32F4 family, change -DSTM32_FAMILY=F1 to -DSTM32_FAMILY=F4
 
-'''Note:''' You can use different CMAKE_INSTALL_PREFIX, but than you'll have to configure cmake search paths when using cmake modules.
+'''Note:''' You can use different CMAKE_INSTALL_PREFIX, but than you'll have to configure cmake search paths when using cmake modules. You may specify an additional search path with -DEXTRA_FIND_PATH=<path-to-search>
 
 '''Note:''' To prevent header collision file "misc.h" from Standard Peripherals Library will be installed as stm32f10x_misc.h / stm32f4xx_misc.h
 

cmake/Modules/FindCMSIS.cmake

@@ -44,7 +44,9 @@ FOREACH(CMSIS_LIB_NAME ${CMSIS_FIND_LIBS})
     LIST(APPEND CMSIS_LIBRARIES ${CMSIS_LIBRARY})
 ENDFOREACH()
 
-FIND_FILE(CMSIS_LINKER_SCRIPT ${CMSIS_LINKER_SCRIPT_NAME} PATHS ${CMAKE_FIND_ROOT_PATH}/share/cmsis/)
+FIND_PATH(CMSIS_LINKER_SCRIPT ${CMSIS_LINKER_SCRIPT_NAME} 
+    PATH_SUFFIXES share/cmsis cmsis
+)
 
 INCLUDE(FindPackageHandleStandardArgs)
 IF(NOT STM32_CHIP_TYPE)

gcc_stm32.cmake

@@ -54,7 +54,7 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-Os -flto" CACHE INTERNAL "cxx compiler flags relea
 SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm compiler flags release")
 SET(CMAKE_EXE_LINKER_FLAGS_RELESE "-flto" CACHE INTERNAL "linker flags release")
 
-SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN_PREFIX}/${TARGET_TRIPLET})
+SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN_PREFIX}/${TARGET_TRIPLET} ${EXTRA_FIND_PATH})
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)