diff options
| author | Johann <johannkoenig@google.com> | 2014-01-08 15:45:14 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2014-01-08 15:45:14 -0800 |
| commit | 0239f1148245f4666784621790236377c951dfb7 (patch) | |
| tree | 1400ff46086fac8e3241d6f7ee293e0da155d951 | |
| parent | 8fcb74e6bb88bc17f1bdc76373b813ea0c45033f (diff) | |
| download | libvpx-0239f1148245f4666784621790236377c951dfb7.tar libvpx-0239f1148245f4666784621790236377c951dfb7.tar.gz libvpx-0239f1148245f4666784621790236377c951dfb7.tar.bz2 libvpx-0239f1148245f4666784621790236377c951dfb7.zip | |
Install test sources for MSVS
Move the code outside the conditions. The test sources themselves are
also required for Visual Studio.
Change-Id: Id5e93ebc7369e1807eba0b9dc4f7d0f18033d794
| -rw-r--r-- | libs.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -471,11 +471,6 @@ $(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/th OBJS-$(BUILD_LIBVPX) += $(LIBVPX_TEST_OBJS) BINS-$(BUILD_LIBVPX) += $(LIBVPX_TEST_BINS) -# Install test sources only if codec source is included -INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(patsubst $(SRC_PATH_BARE)/%,%,\ - $(shell find $(SRC_PATH_BARE)/third_party/googletest -type f)) -INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(LIBVPX_TEST_SRCS) - CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx) CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a) $(foreach bin,$(LIBVPX_TEST_BINS),\ @@ -489,6 +484,11 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\ endif +# Install test sources only if codec source is included +INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(patsubst $(SRC_PATH_BARE)/%,%,\ + $(shell find $(SRC_PATH_BARE)/third_party/googletest -type f)) +INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(LIBVPX_TEST_SRCS) + define test_shard_template test:: test_shard.$(1) test_shard.$(1): $(LIBVPX_TEST_BINS) testdata |