From ad4e31c88ac5eb23011afc3d4133e099343f46fe Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 10 Sep 2015 20:07:38 -0700 Subject: [PATCH 1/2] cmake: Missed anm insuance of config_ Signed-off-by: Mark Charlebois --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b80e97b1c5..90fa38b76f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) From 3de04cf6f414c92a818e7a128f13766bdd17dedb Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 10 Sep 2015 20:17:38 -0700 Subject: [PATCH 2/2] cmake: fixes for posix configs The posix eagle targets were fixed to include the px4_impl_posix.cmake file Signed-off-by: Mark Charlebois --- cmake/configs/posix_eagle_default.cmake | 2 +- cmake/configs/posix_eagle_hil.cmake | 2 +- cmake/configs/posix_eagle_release.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/configs/posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake index 228b4e50ae..17fcc337ff 100644 --- a/cmake/configs/posix_eagle_default.cmake +++ b/cmake/configs/posix_eagle_default.cmake @@ -1,4 +1,4 @@ -include(posix/px4_impl_posix-arm) +include(posix/px4_impl_posix) set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake index af3785f5c7..aa87bd6bb6 100644 --- a/cmake/configs/posix_eagle_hil.cmake +++ b/cmake/configs/posix_eagle_hil.cmake @@ -1,4 +1,4 @@ -include(posix/px4_impl_posix-arm) +include(posix/px4_impl_posix) set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake index cc220cb306..fad14f595f 100644 --- a/cmake/configs/posix_eagle_release.cmake +++ b/cmake/configs/posix_eagle_release.cmake @@ -1,4 +1,4 @@ -include(posix/px4_impl_posix-arm) +include(posix/px4_impl_posix) set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)