mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-04-14 10:07:39 +08:00
Merge branch 'cmake-2' of https://github.com/PX4/Firmware into cmake-2
Signed-off-by: Mark Charlebois <charlebm@gmail.com> Conflicts: CMakeLists.txt
This commit is contained in:
commit
0a04dd89b1
@ -143,6 +143,9 @@ if (NOT ${CMAKE_VERSION} VERSION_LESS 3.0.0)
|
||||
cmake_policy(SET CMP0045 NEW) # error on non-existent target in get prop
|
||||
cmake_policy(SET CMP0046 NEW) # no non-existent targets as dependencies
|
||||
endif()
|
||||
if (NOT ${CMAKE_VERSION} VERSION_LESS 3.1.0)
|
||||
cmake_policy(SET CMP0054 NEW) # don't dereference quoted variables
|
||||
endif()
|
||||
|
||||
set(version_major 1)
|
||||
set(version_minor 0)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user