commit c39c8849749c247b668433853fa128bc47da1c01
author Zach Bush <zmbush@google.com> Wed Oct 03 11:17:40 2018 -0700
committer Zach Bush <zmbush@google.com> Thu Oct 04 09:34:39 2018 -0700
tree c6b491d906b95ba3df0dfbf00b7543e2813fed6c
parent 88a5977efb4f299aa1e87a29bba32ad8070428e5

[CMake] Regenerate CMake files to include rapidjson

Change-Id: I722fa73d7b0a7536b096ea30cdc685a6194196eb

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6341f0f..c5c7445 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,5 @@
    endforeach()
 endmacro()
 
-include_directories(${CMAKE_BINARY_DIR}/third_party/rapidjson)
-
 add_subdirectory(proto)
 add_subdirectory(cc)

cc/CMakeLists.txt

diff --git a/cc/CMakeLists.txt b/cc/CMakeLists.txt
index 65d8d8b..96a3ab5 100644
--- a/cc/CMakeLists.txt
+++ b/cc/CMakeLists.txt
@@ -297,6 +297,7 @@
   tink_proto_tink_lib
   absl::memory
   absl::strings
+  rapidjson
 )
 
 # Library: 'tink_json_keyset_writer'
@@ -322,6 +323,7 @@
   tink_util_statusor
   tink_proto_tink_lib
   absl::strings
+  rapidjson
 )
 
 # Library: 'tink_catalogue'
@@ -690,6 +692,7 @@
   tink_proto_tink_lib
   absl::strings
   gtest gtest_main
+  rapidjson
 )
 
 # Test Binary: 'tink_config_test'

cc/subtle/CMakeLists.txt

diff --git a/cc/subtle/CMakeLists.txt b/cc/subtle/CMakeLists.txt
index cc30c3c..ca4c3d1 100644
--- a/cc/subtle/CMakeLists.txt
+++ b/cc/subtle/CMakeLists.txt
@@ -398,6 +398,7 @@
   tink_util_status
   tink_util_statusor
   absl::strings
+  rapidjson
 )
 
 # Test Binary: 'tink_subtle_ecies_hkdf_recipient_kem_boringssl_test'
@@ -531,6 +532,7 @@
   tink_util_test_util
   absl::strings
   gtest gtest_main
+  rapidjson
 )
 
 # Test Binary: 'tink_subtle_aes_eax_boringssl_test'
@@ -557,6 +559,7 @@
   tink_util_test_util
   absl::strings
   gtest gtest_main
+  rapidjson
 )
 
 # Test Binary: 'tink_subtle_encrypt_then_authenticate_test'
@@ -668,6 +671,7 @@
   tink_util_test_util
   absl::strings
   gtest gtest_main
+  rapidjson
 )
 
 # Test Binary: 'tink_subtle_rsa_ssa_pss_verify_boringssl_test'
@@ -696,6 +700,7 @@
   tink_util_test_util
   absl::strings
   gtest gtest_main
+  rapidjson
 )
 
 # Test Binary: 'tink_subtle_random_test'

cc/util/CMakeLists.txt

diff --git a/cc/util/CMakeLists.txt b/cc/util/CMakeLists.txt
index 13de036..bd8765e 100644
--- a/cc/util/CMakeLists.txt
+++ b/cc/util/CMakeLists.txt
@@ -108,7 +108,8 @@
 set_target_properties(tink_util_test_matchers PROPERTIES LINKER_LANGUAGE CXX)
 tink_export_hdrs(test_matchers.h)
 add_dependencies(tink_util_test_matchers tink_util_status)
-target_link_libraries(tink_util_test_matchers tink_util_status @com_google_googletest//:gtest)
+add_dependencies(tink_util_test_matchers build_external_projects)
+target_link_libraries(tink_util_test_matchers tink_util_status gtest gtest_main)
 
 # Library: 'tink_util_keyset_util'
 add_library(tink_util_keyset_util keyset_util.cc keyset_util.h)