Merge pull request #44 from mcharleb/cmake-mc

cmake: Missed missed instance of config_
This commit is contained in:
James Goppert
2015-09-10 23:43:29 -04:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ endif(NOT NESTED_CMAKE_CALL)
message("OS = ${OS}")
# prefer board implementation module over os implmementation module
set(config_module "configs/config_${OS}_${BOARD}_${LABEL}")
set(config_module "configs/${OS}_${BOARD}_${LABEL}")
set(config_path "${CMAKE_SOURCE_DIR}/cmake/${config_module}.cmake")
if (EXISTS ${config_path})
include(${config_module})
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)