diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-02-20 12:26:38 -0800 |
|---|---|---|
| committer | Alexander Dorokhine <adorokhine@google.com> | 2020-02-20 12:42:47 -0800 |
| commit | de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1 (patch) | |
| tree | 7a3c3db6a9f4739eac3bbb304ec5ae2276b5f5b2 /share/cmake-3.10/Help/module/FindArmadillo.rst | |
| parent | da4b9cb08341185e002c8a8c5df73533cdb93b41 (diff) | |
| parent | 7b4dc2fe14068921358ad685dea0d59c5a58e1fc (diff) | |
| download | linux-x86-de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1.tar.gz | |
Merge remote-tracking branch 'origin/cmake-master-dev' into masterandroidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroidx-wear-wear-input-releaseandroidx-swiperefreshlayout-releaseandroidx-sqlite-inspection-releaseandroidx-security-security-crypto-releaseandroidx-resourceinspection-releaseandroidx-print-releaseandroidx-media2-media2-widget-releaseandroidx-leanback-releaseandroidx-emoji-releaseandroidx-customview-release
* origin/cmake-master-dev:
Upgrade cmake to 3.10.2
Update cmake (ab/4111459)
Add cmake 3.8.2 for tests
Update prebuilts to CMake 3.6.0-rc2 (go/ab/3043163).
Bug: 149853706
Change-Id: Ibed49ca8ac685da3bc5c02fef640c478dad1dcf9
Diffstat (limited to 'share/cmake-3.10/Help/module/FindArmadillo.rst')
| -rw-r--r-- | share/cmake-3.10/Help/module/FindArmadillo.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/share/cmake-3.10/Help/module/FindArmadillo.rst b/share/cmake-3.10/Help/module/FindArmadillo.rst new file mode 100644 index 0000000..f0ac933 --- /dev/null +++ b/share/cmake-3.10/Help/module/FindArmadillo.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindArmadillo.cmake |