From 98897960e13a63bad674c36e4247f99aefbf8ffc Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 10 Sep 2015 20:02:31 -0700 Subject: [PATCH] cmake: removed config_ prefix Signed-off-by: Mark Charlebois --- CMakeLists.txt | 8 ++++---- ...fmu-v2_default.cmake => nuttx_px4fmu-v2_default.cmake} | 0 ...x4fmu-v2_simple.cmake => nuttx_px4fmu-v2_simple.cmake} | 0 ...nfig_nuttx_sim_simple.cmake => nuttx_sim_simple.cmake} | 0 ...osix_eagle_default.cmake => posix_eagle_default.cmake} | 0 ...config_posix_eagle_hil.cmake => posix_eagle_hil.cmake} | 0 ...ig_posix_eagle_muorb.cmake => posix_eagle_muorb.cmake} | 0 ...osix_eagle_release.cmake => posix_eagle_release.cmake} | 0 ...ig_posix_sitl_simple.cmake => posix_sitl_simple.cmake} | 0 ...nfig_qurt_eagle_hello.cmake => qurt_eagle_hello.cmake} | 0 .../{config_qurt_eagle_hil.cmake => qurt_eagle_hil.cmake} | 0 ...nfig_qurt_eagle_muorb.cmake => qurt_eagle_muorb.cmake} | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename cmake/configs/{config_nuttx_px4fmu-v2_default.cmake => nuttx_px4fmu-v2_default.cmake} (100%) rename cmake/configs/{config_nuttx_px4fmu-v2_simple.cmake => nuttx_px4fmu-v2_simple.cmake} (100%) rename cmake/configs/{config_nuttx_sim_simple.cmake => nuttx_sim_simple.cmake} (100%) rename cmake/configs/{config_posix_eagle_default.cmake => posix_eagle_default.cmake} (100%) rename cmake/configs/{config_posix_eagle_hil.cmake => posix_eagle_hil.cmake} (100%) rename cmake/configs/{config_posix_eagle_muorb.cmake => posix_eagle_muorb.cmake} (100%) rename cmake/configs/{config_posix_eagle_release.cmake => posix_eagle_release.cmake} (100%) rename cmake/configs/{config_posix_sitl_simple.cmake => posix_sitl_simple.cmake} (100%) rename cmake/configs/{config_qurt_eagle_hello.cmake => qurt_eagle_hello.cmake} (100%) rename cmake/configs/{config_qurt_eagle_hil.cmake => qurt_eagle_hil.cmake} (100%) rename cmake/configs/{config_qurt_eagle_muorb.cmake => qurt_eagle_muorb.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93370c61f6..b80e97b1c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,16 +112,16 @@ set(package-contact "px4users@googlegroups.com") list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) #============================================================================= -# cmake modules +# Validate build configuration and build # if (NOT NESTED_CMAKE_CALL) message(STATUS "IN TOP") - if (EXISTS ${CMAKE_SOURCE_DIR}/cmake/configs/config_${CONFIG}.cmake) + if (EXISTS ${CMAKE_SOURCE_DIR}/cmake/configs/${CONFIG}.cmake) # Get the toolchain information - include(configs/config_${CONFIG}) + include(configs/${CONFIG}) else() - message(FATAL_ERROR "build config not found: config_${CONFIG}.cmake") + message(FATAL_ERROR "build config not found: ${CONFIG}.cmake") endif() if (NOT "${USE_TOOLCHAIN}" STREQUAL "") set(TOOLCHAIN -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${USE_TOOLCHAIN}.cmake) diff --git a/cmake/configs/config_nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake similarity index 100% rename from cmake/configs/config_nuttx_px4fmu-v2_default.cmake rename to cmake/configs/nuttx_px4fmu-v2_default.cmake diff --git a/cmake/configs/config_nuttx_px4fmu-v2_simple.cmake b/cmake/configs/nuttx_px4fmu-v2_simple.cmake similarity index 100% rename from cmake/configs/config_nuttx_px4fmu-v2_simple.cmake rename to cmake/configs/nuttx_px4fmu-v2_simple.cmake diff --git a/cmake/configs/config_nuttx_sim_simple.cmake b/cmake/configs/nuttx_sim_simple.cmake similarity index 100% rename from cmake/configs/config_nuttx_sim_simple.cmake rename to cmake/configs/nuttx_sim_simple.cmake diff --git a/cmake/configs/config_posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake similarity index 100% rename from cmake/configs/config_posix_eagle_default.cmake rename to cmake/configs/posix_eagle_default.cmake diff --git a/cmake/configs/config_posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake similarity index 100% rename from cmake/configs/config_posix_eagle_hil.cmake rename to cmake/configs/posix_eagle_hil.cmake diff --git a/cmake/configs/config_posix_eagle_muorb.cmake b/cmake/configs/posix_eagle_muorb.cmake similarity index 100% rename from cmake/configs/config_posix_eagle_muorb.cmake rename to cmake/configs/posix_eagle_muorb.cmake diff --git a/cmake/configs/config_posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake similarity index 100% rename from cmake/configs/config_posix_eagle_release.cmake rename to cmake/configs/posix_eagle_release.cmake diff --git a/cmake/configs/config_posix_sitl_simple.cmake b/cmake/configs/posix_sitl_simple.cmake similarity index 100% rename from cmake/configs/config_posix_sitl_simple.cmake rename to cmake/configs/posix_sitl_simple.cmake diff --git a/cmake/configs/config_qurt_eagle_hello.cmake b/cmake/configs/qurt_eagle_hello.cmake similarity index 100% rename from cmake/configs/config_qurt_eagle_hello.cmake rename to cmake/configs/qurt_eagle_hello.cmake diff --git a/cmake/configs/config_qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake similarity index 100% rename from cmake/configs/config_qurt_eagle_hil.cmake rename to cmake/configs/qurt_eagle_hil.cmake diff --git a/cmake/configs/config_qurt_eagle_muorb.cmake b/cmake/configs/qurt_eagle_muorb.cmake similarity index 100% rename from cmake/configs/config_qurt_eagle_muorb.cmake rename to cmake/configs/qurt_eagle_muorb.cmake