Merge remote-tracking branch 'aosp/upstream-master' into HEADHEADmastermainemu-35-1-releaseemu-34-releaseemu-34-3-releaseemu-34-2-releaseemu-34-2-devemu-33-releaseemu-33-devemu-32-releaseemu-32-devemu-31-stable-releaseemu-31-releaseemu-30-releaseemu-29.0-releaseaosp-emu-30-release

Change-Id: I3cacc9da948c56f15cb96f03a2142ffab4f65846

1 files changed, 22 insertions, 1 deletions

diff --git a/README.md b/README.md
index 7d53cb8..8bb2c26 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ bool result = astc_codec::ASTCDecompressToRGBA(
 
 ## Building
 
+### With bazel
+
 Install [Bazel](https://bazel.build/), and then run:
 
 ```
@@ -32,12 +34,31 @@ bazel build :astc_codec -c opt
 
 astc-codec has been tested on Mac and Linux.
 
-## Run Tests
+### Run Tests
 
 ```
 bazel test //...
 ```
 
+### With CMake
+
+Install [CMake](https://https://cmake.org/), and the run:
+
+```
+mkdir build && cd build && cmake .. && make
+```
+
+Or open the project in your favorite IDE and import CMakeLists.txt.
+
+### Run Tests
+
+In the build directory, execute:
+
+```
+ctest
+```
+
+
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for important contributing requirements.