Skip to content

Commit

Permalink
Ask pkg-config about gtest_main as well.
Browse files Browse the repository at this point in the history
vcpkg installs `libgtest_main.a` into a `manual-link` subdirectory
for some reason...

Change-Id: I0842281094dae10ee82e72c22c165d3a8141cbe9
Reviewed-on: https://code-review.googlesource.com/c/re2/+/63090
Reviewed-by: Alex Chernyakhovsky <[email protected]>
Reviewed-by: Paul Wankadia <[email protected]>
  • Loading branch information
junyer committed May 17, 2024
1 parent a67d6c1 commit b664e41
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ LDABSL=$(shell $(PKG_CONFIG) $(ABSL_DEPS) --libs | sed -e 's/-Wl / /g')

# Build against GoogleTest and Benchmark for... testing and benchmarking.
# Capture only the `-L` flags for now; we will pass the `-l` flags later.
CCGTEST=$(shell $(PKG_CONFIG) gtest --cflags)
LDGTEST=$(shell $(PKG_CONFIG) gtest --libs-only-L)
CCGTEST=$(shell $(PKG_CONFIG) gtest gtest_main --cflags)
LDGTEST=$(shell $(PKG_CONFIG) gtest gtest_main --libs-only-L)
CCBENCHMARK=$(shell $(PKG_CONFIG) benchmark --cflags)
LDBENCHMARK=$(shell $(PKG_CONFIG) benchmark --libs-only-L)

Expand Down

0 comments on commit b664e41

Please sign in to comment.