diff options
| author | David Benjamin <davidben@google.com> | 2023-02-15 11:04:01 -0500 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-15 19:50:04 +0000 |
| commit | 987dff1a9fa953a8c7dffa369d78caae02b8d9ab (patch) | |
| tree | 0c5d9cfada210e4c2e1a0d5105b9c0d593fc6470 /decrepit | |
| parent | f30c031f0b42280edce0bfc66ef1f7486b015820 (diff) | |
| download | boringssl-987dff1a9fa953a8c7dffa369d78caae02b8d9ab.zip boringssl-987dff1a9fa953a8c7dffa369d78caae02b8d9ab.tar.gz boringssl-987dff1a9fa953a8c7dffa369d78caae02b8d9ab.tar.bz2 | |
Make boringssl_gtest_main a STATIC library
Prior to 3.12 (which we won't be requiring until July), OBJECT libraries
cannot be used with target_link_libraries. That means they cannot pick
up INTERFACE_INCLUDE_DIRECTORIES, which makes them pretty unusable in
the "modern CMake" style.
Just switch it to a static library to unbreak the build in CMake 3.10.
For some link ordering reason I don't understand, this also requires
explicitly linking boringssl_gtest to libcxx when we USE_CUSTOM_LIBCXX
is set.
Change-Id: Ia9d8351551f5da060248aa3ca73fe04473bf62aa
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57345
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Diffstat (limited to 'decrepit')
| -rw-r--r-- | decrepit/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt index 48b0cf1..927882e 100644 --- a/decrepit/CMakeLists.txt +++ b/decrepit/CMakeLists.txt @@ -30,9 +30,7 @@ add_executable( evp/evp_test.cc ripemd/ripemd_test.cc xts/xts_test.cc - - $<TARGET_OBJECTS:boringssl_gtest_main> ) -target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit - crypto) +target_link_libraries(decrepit_test test_support_lib boringssl_gtest_main + decrepit crypto) add_dependencies(all_tests decrepit_test) |