src/platforms: move remaining source files to platforms/common

PX4 · Aug 30, 2019 · f32abe8 · f32abe8
1 parent f8e0441
commit f32abe8
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/src/platforms/apps.cpp.in → platforms/common/apps.cpp.in b/src/platforms/apps.cpp.in → platforms/common/apps.cpp.in
diff --git a/src/platforms/apps.h.in → platforms/common/apps.h.in b/src/platforms/apps.h.in → platforms/common/apps.h.in
diff --git a/src/platforms/empty.c → platforms/common/empty.c b/src/platforms/empty.c → platforms/common/empty.c
diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
@@ -36,7 +36,7 @@ include(cygwin_cygpath)
 set(NUTTX_DIR ${PX4_BINARY_DIR}/NuttX/nuttx)
 set(NUTTX_APPS_DIR ${PX4_BINARY_DIR}/NuttX/apps)
 
-add_executable(px4 ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+add_executable(px4 ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 set(FW_NAME ${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf)
 set_target_properties(px4 PROPERTIES OUTPUT_NAME ${FW_NAME})
 add_dependencies(px4 git_nuttx nuttx_build)

diff --git a/platforms/nuttx/src/px4/common/CMakeLists.txt b/platforms/nuttx/src/px4/common/CMakeLists.txt
@@ -48,6 +48,6 @@ if (NOT ${PX4_BOARD} MATCHES "px4_io")
 			px4_work_queue
 		)
 else()
-	add_library(px4_layer ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+	add_library(px4_layer ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 endif()
 add_dependencies(px4_layer prebuild_targets)
diff --git a/platforms/posix/cmake/px4_impl_os.cmake b/platforms/posix/cmake/px4_impl_os.cmake
@@ -99,8 +99,8 @@ function(px4_posix_generate_builtin_commands)
 			math(EXPR command_count "${command_count}+1")
 		endif()
 	endforeach()
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.cpp.in ${OUT}.cpp)
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.h.in ${OUT}.h)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.cpp.in ${OUT}.cpp)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.h.in ${OUT}.h)
 endfunction()
 
 

diff --git a/platforms/qurt/cmake/px4_impl_os.cmake b/platforms/qurt/cmake/px4_impl_os.cmake
@@ -95,8 +95,8 @@ function(px4_qurt_generate_builtin_commands)
 			math(EXPR command_count "${command_count}+1")
 		endif()
 	endforeach()
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.cpp.in ${OUT}.cpp)
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.h.in ${OUT}.h)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.cpp.in ${OUT}.cpp)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.h.in ${OUT}.h)
 endfunction()
 
 #=============================================================================

diff --git a/src/lib/parameters/CMakeLists.txt b/src/lib/parameters/CMakeLists.txt
@@ -155,7 +155,7 @@ if (NOT "${PX4_BOARD}" MATCHES "px4_io")
 			-Wno-sign-compare	# TODO: fix and enable
 	)
 else()
-	add_library(parameters ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+	add_library(parameters ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 endif()
 add_dependencies(parameters prebuild_targets)