You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/19 20:09:39 UTC

svn commit: r1735803 - /openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk

Author: damjan
Date: Sat Mar 19 19:09:39 2016
New Revision: 1735803

URL: http://svn.apache.org/viewvc?rev=1735803&view=rev
Log:
Fix Windows build in ext_libraries/gtest: set_defs is now forbidden,
use add_defs instead.

Patch by: me


Modified:
    openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk

Modified: openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk?rev=1735803&r1=1735802&r2=1735803&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk (original)
+++ openoffice/branches/gbuild-reintegration/ext_libraries/gtest/win/Library_gtest.mk Sat Mar 19 19:09:39 2016
@@ -31,8 +31,7 @@ $(eval $(call gb_Library_set_include,gte
 	-I./include \
 ))
 
-$(eval $(call gb_Library_set_defs,gtest,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,gtest,\
 	-DGTEST_CREATE_SHARED_LIBRARY=1 \
 ))