fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 17:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2925 from mcharleb/cmake-2-qurt-eigen

Browse Source 
qurt: Must use latest version of Eigen
This commit is contained in:
Lorenz Meier
2015-10-01 09:51:36 +02:00
parent 837d122dda c5e66e41f1
commit 6987c1367e
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-3
View File
@@ -22,6 +22,3 @@
[submodule "src/lib/dspal"] [submodule "src/lib/dspal"]
path = src/lib/dspal path = src/lib/dspal
url = https://github.com/mcharleb/dspal.git url = https://github.com/mcharleb/dspal.git
[submodule "src/lib/eigen-3.2"]
path = src/lib/eigen-3.2
url = https://github.com/PX4/eigen.git
cmake/common/px4_base.cmake
+1 -1
View File
@@ -139,7 +139,7 @@ function(px4_add_git_submodule)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git_${NAME}.stamp add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git_${NAME}.stamp
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND git submodule init ${PATH} COMMAND git submodule init ${PATH}
COMMAND git submodule update ${PATH} COMMAND git submodule update -f ${PATH}
COMMAND touch ${CMAKE_BINARY_DIR}/git_${NAME}.stamp COMMAND touch ${CMAKE_BINARY_DIR}/git_${NAME}.stamp
) )
add_custom_target(${TARGET} add_custom_target(${TARGET}
cmake/qurt/px4_impl_qurt.cmake
+1
View File
@@ -225,6 +225,7 @@ function(px4_os_prebuild_targets)
add_custom_target(git_eigen_patched add_custom_target(git_eigen_patched
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/lib/eigen WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/lib/eigen
COMMAND git checkout . COMMAND git checkout .
COMMAND git checkout master
COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/cmake/qurt/qurt_eigen.patch COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/cmake/qurt/qurt_eigen.patch
DEPENDS git_eigen) DEPENDS git_eigen)
add_custom_target(${OUT} DEPENDS git_dspal git_eigen_patched) add_custom_target(${OUT} DEPENDS git_dspal git_eigen_patched)
src/lib/eigen-3.2
-1
Submodule src/lib/eigen-3.2 deleted from e7850ed81f