cmake px4_base -> px4_parse_function_args

5 years ago · fb7521eb5e
11 changed files with 4 additions and 31 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -105,6 +105,7 @@ set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
				@@ -105,6 +105,7 @@ set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")

 list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake)
+include(px4_parse_function_args)

 #=============================================================================
 # git
--- a/cmake/gtest/px4_add_gtest.cmake
+++ b/cmake/gtest/px4_add_gtest.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_gtest
--- a/cmake/px4_add_board.cmake
+++ b/cmake/px4_add_board.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_board
--- a/cmake/px4_add_common_flags.cmake
+++ b/cmake/px4_add_common_flags.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_common_flags
--- a/cmake/px4_add_library.cmake
+++ b/cmake/px4_add_library.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_library
--- a/cmake/px4_add_module.cmake
+++ b/cmake/px4_add_module.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_module
--- a/cmake/px4_git.cmake
+++ b/cmake/px4_git.cmake
@ -31,8 +31,6 @@
				@@ -31,8 +31,6 @@
 #
 ############################################################################

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_add_git_submodule
--- a/cmake/px4_parse_function_args.cmake
+++ b/cmake/px4_parse_function_args.cmake
@ -31,17 +31,6 @@
				@@ -31,17 +31,6 @@
 #
 ############################################################################

-#=============================================================================
-#
-#	Defined functions in this file
-#
-# 	utility functions
-#
-#		* px4_parse_function_args
-#
-
-include(CMakeParseArguments)
-
 #=============================================================================
 #
 #	px4_parse_function_args
@ -88,6 +77,7 @@ include(CMakeParseArguments)
				@@ -88,6 +77,7 @@ include(CMakeParseArguments)
 #			name: hello
 #			list: a b c
 #
+include(CMakeParseArguments)
 function(px4_parse_function_args)

 	cmake_parse_arguments(IN "" "NAME" "OPTIONS;ONE_VALUE;MULTI_VALUE;REQUIRED;ARGN" "${ARGN}")
--- a/platforms/nuttx/cmake/px4_impl_os.cmake
+++ b/platforms/nuttx/cmake/px4_impl_os.cmake
@ -42,8 +42,6 @@
				@@ -42,8 +42,6 @@
 #		* px4_os_prebuild_targets
 #

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_os_add_flags
--- a/platforms/posix/cmake/px4_impl_os.cmake
+++ b/platforms/posix/cmake/px4_impl_os.cmake
@ -46,8 +46,6 @@
				@@ -46,8 +46,6 @@
 #		* px4_os_prebuild_targets
 #

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_posix_generate_builtin_commands
@ -219,7 +217,7 @@ function(px4_os_add_flags)
				@@ -219,7 +217,7 @@ function(px4_os_add_flags)
 		-D__PX4_POSIX
 		-Dnoreturn_function=__attribute__\(\(noreturn\)\)
 		)
-		
+
 	include_directories(platforms/posix/include)

 	if ("${PX4_BOARD}" MATCHES "sitl")
@ -314,7 +312,7 @@ function(px4_os_add_flags)
				@@ -314,7 +312,7 @@ function(px4_os_add_flags)
 		set(LIBROBOTCONTROL_INSTALL_DIR $ENV{LIBROBOTCONTROL_INSTALL_DIR})

 		# On cross compile host system and native build system:
-		#   a) select and define LIBROBOTCONTROL_INSTALL_DIR environment variable so that 
+		#   a) select and define LIBROBOTCONTROL_INSTALL_DIR environment variable so that
 		#      other unwanted headers will not be included
 		#   b) install robotcontrol.h and rc/* into $LIBROBOTCONTROL_INSTALL_DIR/include
 		#   c) install pre-built native (ARM) version of librobotcontrol.* into $LIBROBOTCONTROL_INSTALL_DIR/lib
--- a/platforms/qurt/cmake/px4_impl_os.cmake
+++ b/platforms/qurt/cmake/px4_impl_os.cmake
@ -49,8 +49,6 @@
				@@ -49,8 +49,6 @@
 #		* px4_os_prebuild_targets
 #

-include(px4_base)
-
 #=============================================================================
 #
 #	px4_qurt_generate_builtin_commands