Merge "Install test sources for MSVS"

67ad03ac · Johann · Gerrit Code Review · feaad4f1 · 0239f114 · 67ad03ac
Commit 67ad03ac authored Jan 08, 2014 by Johann Committed by Gerrit Code Review Jan 08, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

libs.mk libs.mk +5 -5

No files found.
--- a/libs.mk
+++ b/libs.mk
@@ -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