DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-03-25 19:14:36 +03:00
parent b49b22afd0
commit 995fee09af
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
depends/packages/googletest.mk
View File

@@ -25,14 +25,9 @@ endef
endif
define $(package)_stage_cmds
<<<<<<< HEAD
$($(package)_install) -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
=======
mkdir -p $($(package)_staging_dir)$(host_prefix)/lib && \
install ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
install ./googletest/make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
cp -a ./googlemock/include $($(package)_staging_dir)$(host_prefix)/ && \
cp -a ./googletest/include $($(package)_staging_dir)$(host_prefix)/
>>>>>>> zcash/master
endef