From 0dab16123efb56eaad43aacdc0134a6e1ad6eaca Mon Sep 17 00:00:00 2001 From: James Goppert Date: Tue, 8 Sep 2015 00:30:35 -0400 Subject: [PATCH] Rename of modules. --- CMakeLists.txt | 10 +++++++--- cmake/{px4_utils.cmake => px4_base.cmake} | 0 cmake/{px4_nuttx_utils.cmake => px4_impl_nuttx.cmake} | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) rename cmake/{px4_utils.cmake => px4_base.cmake} (100%) rename cmake/{px4_nuttx_utils.cmake => px4_impl_nuttx.cmake} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84274c09ee..fe287e7761 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,10 +37,10 @@ # Structure # --------------------------------------------------------------------------- # -# * Common functions should be included in px_utils.cmake. +# * Common functions should be included in px_base.cmake. # # * OS/ board specific fucntions should be include in -# px_${OS}_utils.cmake or px4_${OS}_${BOARD}_utils.cmake. +# px_impl_${OS}.cmake or px4_impl_${OS}_${BOARD}.cmake. # # Formatting # --------------------------------------------------------------------------- @@ -110,7 +110,11 @@ set(package-contact "px4users@googlegroups.com") # list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -include(px4_${OS}_utils) +if (EXISTS px4_impl_${OS}_${BOARD}) + include(px4_impl_${OS}_${BOARD}) +else() + include(px4_impl_${OS}) +endif() set(px4_required_functions px4_os_prebuild_targets px4_os_add_flags diff --git a/cmake/px4_utils.cmake b/cmake/px4_base.cmake similarity index 100% rename from cmake/px4_utils.cmake rename to cmake/px4_base.cmake diff --git a/cmake/px4_nuttx_utils.cmake b/cmake/px4_impl_nuttx.cmake similarity index 99% rename from cmake/px4_nuttx_utils.cmake rename to cmake/px4_impl_nuttx.cmake index 7e5240179c..ef704f1ec2 100644 --- a/cmake/px4_nuttx_utils.cmake +++ b/cmake/px4_impl_nuttx.cmake @@ -49,7 +49,7 @@ # * px4_os_prebuild_targets # -include(px4_utils) +include(px4_base) #============================================================================= #