aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2018-09-02 20:57:46 -0700
committerGitHub <noreply@github.com>2018-09-02 20:57:46 -0700
commitfd90f4536045bc881b8b895731fe72d89450b6b4 (patch)
treed6c3bbfbc4da28df0ef418058fd59f7fe647c50a
parent37b5617d42d02d225faa1d64565696f5bfb8e61a (diff)
parent64f5af2f9c3ec08ecb25b4f5460608a744ed6242 (diff)
downloadprotobuf-fd90f4536045bc881b8b895731fe72d89450b6b4.tar.gz
protobuf-fd90f4536045bc881b8b895731fe72d89450b6b4.tar.bz2
protobuf-fd90f4536045bc881b8b895731fe72d89450b6b4.zip
Merge pull request #5103 from haberman/cmake
Added conformance test impl file to CMake.
-rw-r--r--cmake/conformance.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/conformance.cmake b/cmake/conformance.cmake
index 17fa4b96..ec1f9e00 100644
--- a/cmake/conformance.cmake
+++ b/cmake/conformance.cmake
@@ -21,6 +21,7 @@ add_custom_command(
add_executable(conformance_test_runner
${protobuf_source_dir}/conformance/conformance.pb.cc
${protobuf_source_dir}/conformance/conformance_test.cc
+ ${protobuf_source_dir}/conformance/conformance_test_impl.cc
${protobuf_source_dir}/conformance/conformance_test_runner.cc
${protobuf_source_dir}/conformance/third_party/jsoncpp/json.h
${protobuf_source_dir}/conformance/third_party/jsoncpp/jsoncpp.cpp