diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index 60cb06a3dc..0ea1c0d800 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -97,6 +97,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/controllib diff --git a/cmake/configs/nuttx_px4fmu-v2_simple.cmake b/cmake/configs/nuttx_px4fmu-v2_simple.cmake index ddd639ac5a..e6777cd32a 100644 --- a/cmake/configs/nuttx_px4fmu-v2_simple.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_simple.cmake @@ -69,6 +69,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/controllib diff --git a/cmake/configs/posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake index 36c787edca..b30dcef5e3 100644 --- a/cmake/configs/posix_eagle_default.cmake +++ b/cmake/configs/posix_eagle_default.cmake @@ -22,6 +22,7 @@ set(config_module_list modules/mc_pos_control modules/mc_att_control + modules/param modules/systemlib modules/systemlib/mixer modules/uORB diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake index c4e5375766..ee5feb6535 100644 --- a/cmake/configs/posix_eagle_hil.cmake +++ b/cmake/configs/posix_eagle_hil.cmake @@ -17,6 +17,7 @@ set(config_module_list modules/mavlink + modules/param modules/systemlib modules/uORB modules/sensors diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake index 36a9ad1be3..ab930abea3 100644 --- a/cmake/configs/posix_eagle_release.cmake +++ b/cmake/configs/posix_eagle_release.cmake @@ -15,6 +15,7 @@ set(config_module_list modules/mavlink + modules/param modules/systemlib modules/uORB modules/dataman diff --git a/cmake/configs/posix_sitl_simple.cmake b/cmake/configs/posix_sitl_simple.cmake index 10a02fa89f..b557401810 100644 --- a/cmake/configs/posix_sitl_simple.cmake +++ b/cmake/configs/posix_sitl_simple.cmake @@ -23,6 +23,7 @@ set(config_module_list systemcmds/reboot systemcmds/topic_listener modules/uORB + modules/param modules/systemlib modules/systemlib/mixer modules/sensors diff --git a/cmake/configs/qurt_eagle_hello.cmake b/cmake/configs/qurt_eagle_hello.cmake index 9076ec7511..45ae2b22ed 100644 --- a/cmake/configs/qurt_eagle_hello.cmake +++ b/cmake/configs/qurt_eagle_hello.cmake @@ -13,6 +13,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/uORB diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index e661ca5b62..bab551262d 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -33,6 +33,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/uORB diff --git a/cmake/configs/qurt_eagle_muorb.cmake b/cmake/configs/qurt_eagle_muorb.cmake index 5c83f9e68d..afdc35dad5 100644 --- a/cmake/configs/qurt_eagle_muorb.cmake +++ b/cmake/configs/qurt_eagle_muorb.cmake @@ -13,6 +13,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/uORB diff --git a/cmake/configs/qurt_eagle_release.cmake b/cmake/configs/qurt_eagle_release.cmake index 1807e0b56c..0b03dcea48 100644 --- a/cmake/configs/qurt_eagle_release.cmake +++ b/cmake/configs/qurt_eagle_release.cmake @@ -55,6 +55,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/uORB diff --git a/cmake/configs/qurt_eagle_test.cmake b/cmake/configs/qurt_eagle_test.cmake index c25191f5b9..5e9cffc407 100644 --- a/cmake/configs/qurt_eagle_test.cmake +++ b/cmake/configs/qurt_eagle_test.cmake @@ -13,6 +13,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/uORB diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index ab766f189c..15593df251 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -36,6 +36,7 @@ set(config_module_list # # Library modules # + modules/param modules/systemlib modules/systemlib/mixer modules/uORB diff --git a/src/modules/param/CMakeLists.txt b/src/modules/param/CMakeLists.txt new file mode 100644 index 0000000000..4e15ca6e5a --- /dev/null +++ b/src/modules/param/CMakeLists.txt @@ -0,0 +1,50 @@ +############################################################################ +# +# Copyright (c) 2015 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +px4_generate_parameters(OUT param_files) + +set(srcs + ${param_files} + ) + +px4_add_module( + MODULE modules__param + COMPILE_FLAGS + -Os + SRCS ${srcs} + DEPENDS + platforms__common + ) +# vim: set noet ft=cmake fenc=utf-8 ff=unix : diff --git a/src/modules/systemlib/CMakeLists.txt b/src/modules/systemlib/CMakeLists.txt index 3acedcbdd6..6f0f7c5f54 100644 --- a/src/modules/systemlib/CMakeLists.txt +++ b/src/modules/systemlib/CMakeLists.txt @@ -31,13 +31,10 @@ # ############################################################################ -px4_generate_parameters(OUT param_files) - # for generated files -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_BINARY_DIR}/src/modules/param) set(SRCS - ${param_files} perf_counter.c param/param.c conversions.c @@ -82,5 +79,6 @@ px4_add_module( SRCS ${SRCS} DEPENDS platforms__common + modules__param ) # vim: set noet ft=cmake fenc=utf-8 ff=unix :