Commit Graph

14145 Commits

Author SHA1 Message Date
James Goppert 68a78b0580 Some cleanup of cmake module build. 2015-09-12 00:49:10 -04:00
James Goppert 0d28cdeb88 Fixed extra builtin target name. 2015-09-12 00:24:16 -04:00
James Goppert b05a21477a Merge branch 'cmake-2-qurt-fixes' of github.com:mcharleb/Firmware into cmake-2 2015-09-12 00:20:42 -04:00
Mark Charlebois ce17984bd5 qurt: removed linker script
Linker script no longer needed for qurt target

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 18:48:37 -07:00
Mark Charlebois 8369e33245 cmake: Fixes for qurt and nuttx
Added px4_parameters.c to nuttx executable src list.
Minor syntax fix in Tools/px_generate_params.py for semicolon.
Added handling of PX4_MAIN which was not yet supoprted in the
cmake build.
Fixed include quotes in muorb_test_example.cpp

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 18:32:44 -07:00
Mark Charlebois 1bba87c264 qurt: Changes for cmake build
Added build stubs.
Fixed missing module (platforms/common) which was causing missing generated message errors.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 17:43:25 -07:00
Lorenz Meier 6eb4d015fd Bring back user-friendly Makefile for non-Ubuntu users 2015-09-12 01:39:57 +02:00
Lorenz Meier 7c3de9bc2c Merge pull request #2837 from mcharleb/cmake-2-param-fixes
cmake: Updated makefile to show the available build configs
2015-09-12 01:21:55 +02:00
Mark Charlebois e4b9212e96 cmake: Updated makefie to show the available build configs
Also fixed param support for nuttx and qurt

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 16:15:48 -07:00
Lorenz Meier 31e5697cea OS X: Make param section generation compatible 2015-09-11 21:58:32 +02:00
Lorenz Meier 4178910509 Merge branch 'cmake-mc' of github.com:mcharleb/Firmware into cmake-2 2015-09-11 21:51:17 +02:00
Lorenz Meier 458b72352a Simulator: POSIX adjustments 2015-09-11 21:49:29 +02:00
Lorenz Meier d5f110cc92 sdlog2: POSIX adjustments 2015-09-11 21:49:19 +02:00
Lorenz Meier c29e47b3fc MAVLink: POSIX adjustments 2015-09-11 21:49:06 +02:00
Lorenz Meier 60db613a8f EKF: OS X adjustments 2015-09-11 21:48:50 +02:00
Lorenz Meier 12a1ffd27b Commander: POSIX adjustments 2015-09-11 21:48:36 +02:00
Lorenz Meier 0f98a7c141 OS X: Add missing time calls 2015-09-11 21:48:06 +02:00
Lorenz Meier 1b1adf3835 Add required flag for OS X 2015-09-11 21:47:50 +02:00
Mark Charlebois 05340f4ced Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake-mc 2015-09-11 12:42:53 -07:00
Mark Charlebois fc3acdb2c1 cmake: param refactoring
Use a struct to contain all the parameters so the ordering in
memory is not machine dependent.

Add number of parameters to the param struct. The struct actually
allows direct accessing by the member name if desired.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 12:41:00 -07:00
Lorenz Meier 5b86f3f3b3 Merge branch 'cmake-2' of github.com:jgoppert/Firmware into cmake-2 2015-09-11 21:39:45 +02:00
James Goppert 298fbf0080 Added more targets to phony. 2015-09-11 13:52:14 -04:00
James Goppert ad321927e9 Added install target for nuttx. 2015-09-11 06:38:39 -04:00
Lorenz Meier e673a25344 Fix flags for OS X 2015-09-11 11:58:04 +02:00
James Goppert 1668e69011 Merge pull request #46 from mcharleb/cmake-mc
param: Build param without linker script
2015-09-11 05:53:37 -04:00
Mark Charlebois b9ef1ee6ed param: Build param without linker script
Changed to enable the posix_sitl_simple target to build and run

param show *

without using a linker script

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 02:33:42 -07:00
James Goppert 3de0bbf527 Merge pull request #45 from mcharleb/cmake-config-fixes
cmake: converted config files to new style
2015-09-11 01:46:01 -04:00
Mark Charlebois 885dbe045f cmake: converted config files to new style
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 21:52:55 -07:00
James Goppert 31c3f4e40f Fix for travis mixer cat. 2015-09-11 00:49:11 -04:00
James Goppert 4bce702ed1 Added rt library to link for posix to fix travis build. 2015-09-11 00:45:23 -04:00
James Goppert 9ab9e1f142 Set version to correct number. 2015-09-11 00:31:36 -04:00
James Goppert f94e3b3aaa Fixed config check. 2015-09-11 00:28:13 -04:00
James Goppert 8bc81d985f Fixed typo in version, exposed some more useful cmake targets. 2015-09-11 00:24:30 -04:00
James Goppert 0e8cc821a9 More config cleanup. 2015-09-11 00:15:33 -04:00
James Goppert ec209f13f0 Simplified config handling. 2015-09-10 23:53:25 -04:00
James Goppert 3d52582dd7 Merge branch 'cmake-2' of github.com:jgoppert/Firmware into cmake-2
Conflicts:
	CMakeLists.txt
2015-09-10 23:44:39 -04:00
James Goppert 07851b79c2 Work on config only for cmake arguments. 2015-09-10 23:43:59 -04:00
James Goppert 706905f35e Merge pull request #44 from mcharleb/cmake-mc
cmake: Missed missed instance of config_
2015-09-10 23:43:29 -04:00
Mark Charlebois 3de04cf6f4 cmake: fixes for posix configs
The posix eagle targets were fixed to include the px4_impl_posix.cmake file

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:17:38 -07:00
Mark Charlebois ad4e31c88a cmake: Missed anm insuance of config_
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:07:38 -07:00
James Goppert 97cb25254d Merge pull request #43 from mcharleb/cmake-mc
cmake: fixed posix configs
2015-09-10 23:04:00 -04:00
Mark Charlebois 98897960e1 cmake: removed config_ prefix
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:02:31 -07:00
Mark Charlebois 0047b38c54 cmake: added Toolchain-arm-linux-gnueabihf
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:52:23 -07:00
Mark Charlebois 3b118a0ea7 cmake: Removed obsolete UPLOAD and TEST logic
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:43:54 -07:00
Mark Charlebois 4beabff26b cmake: fixed posix configs
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:38:22 -07:00
James Goppert 3104a974a9 Merge pull request #42 from mcharleb/cmake-mc
Cmake mc
2015-09-10 22:30:42 -04:00
Mark Charlebois cbb8ad19e5 cmake: Proof of concept for build without Makefile
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:15:11 -07:00
Mark Charlebois 5aa3c45b63 cmake: Unbreak all qurt and posix targets
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:01:51 -07:00
James Goppert 813a1219a5 Work on travis, set package generators for cpack. 2015-09-10 21:54:58 -04:00
Mark Charlebois d5a404896d Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake-mc 2015-09-10 18:39:12 -07:00