mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 07:40:07 +02:00
77 lines
4.2 KiB
Plaintext
77 lines
4.2 KiB
Plaintext
From 5aeb203c8d4ae0b4e969b27637284b613aa920f3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Tue, 6 Feb 2018 21:44:49 +0100
|
|
Subject: System lib support
|
|
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 318180e..6f21e36 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -718,11 +718,7 @@ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
|
|
protobuf-lite-test test_plugin protobuf-lite-arena-test \
|
|
no-warning-test $(GZCHECKPROGRAMS)
|
|
protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
|
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
|
|
- -I$(GOOGLEMOCK_SRC_DIR)/include
|
|
+ -lgtest -lgmock -lgmock_main
|
|
# Disable optimization for tests unless the user explicitly asked for it,
|
|
# since test_util.cc takes forever to compile with optimization (with GCC).
|
|
# See configure.ac for more info.
|
|
@@ -814,12 +810,7 @@ $(am_protobuf_test_OBJECTS): unittest_proto_middleman
|
|
# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
|
|
protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
|
|
libprotoc.la \
|
|
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
- -I$(GOOGLETEST_SRC_DIR)/include \
|
|
- -DPROTOBUF_TEST_NO_DESCRIPTORS
|
|
+ -lgtest -lgmock -lgmock_main
|
|
protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
protobuf_lazy_descriptor_test_SOURCES = \
|
|
google/protobuf/compiler/cpp/cpp_unittest.cc \
|
|
@@ -840,11 +831,7 @@ COMMON_LITE_TEST_SOURCES = \
|
|
# full runtime and we want to make sure this test builds without full
|
|
# runtime.
|
|
protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
|
|
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
- -I$(GOOGLETEST_SRC_DIR)/include
|
|
+ -lgtest -lgmock -lgmock_main
|
|
protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
protobuf_lite_test_SOURCES = \
|
|
google/protobuf/lite_unittest.cc \
|
|
@@ -856,11 +843,7 @@ $(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman
|
|
# gtest when building the test internally our memory sanitizer doesn't detect
|
|
# memory leaks (don't know why).
|
|
protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
|
|
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
- -I$(GOOGLETEST_SRC_DIR)/include
|
|
+ -lgtest -lgmock -lgmock_main
|
|
protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
protobuf_lite_arena_test_SOURCES = \
|
|
google/protobuf/lite_arena_unittest.cc \
|
|
@@ -870,8 +853,7 @@ $(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman
|
|
|
|
# Test plugin binary.
|
|
test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
|
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
|
|
-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
|
|
+ -lgtest
|
|
test_plugin_SOURCES = \
|
|
google/protobuf/compiler/mock_code_generator.cc \
|
|
google/protobuf/testing/file.cc \
|
|
--
|
|
2.24.0
|
|
|