diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-02 10:07:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-02 10:07:14 -0700 |
| commit | d340bdf50821e6db173a9e41bc7bde740275ba33 (patch) | |
| tree | 476323777542a132b28b6d0a1ef8442b7ec85acb /Makefile.am | |
| parent | d42ec0791ac63a12765cf9b09e9438bbcefdf1d1 (diff) | |
| parent | 0e3fa28e47c74684f6db3ca01430274864f576f0 (diff) | |
| download | protobuf-d340bdf50821e6db173a9e41bc7bde740275ba33.tar.gz protobuf-d340bdf50821e6db173a9e41bc7bde740275ba33.tar.bz2 protobuf-d340bdf50821e6db173a9e41bc7bde740275ba33.zip | |
Merge pull request #5078 from haberman/conformance-cmake
Added cmake build files for the conformance test runner.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 6694dffe..b0913a58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1043,6 +1043,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ WORKSPACE \ cmake/CMakeLists.txt \ cmake/README.md \ + cmake/conformance.cmake \ cmake/examples.cmake \ cmake/extract_includes.bat.in \ cmake/install.cmake \ |