Re: [PATCH] Re: [PATCH] OPW 2013: Build System Gtest Addition

On 05.02.2013 14:28, Gabriela Gibson wrote:
> On 02/02/13 10:31, Branko Čibej wrote:
>> You could try adding ${abs_srcdir}/gtest/include to the include path. :)
>> Also, you'll get rid of those warnings by adding appropriate paths to
>> the private-includes list in build.conf.
>>
>> -- Brane
>>
> Thanks Brane,
>
> I think it is now working, please see attached patch and log.

I see this:

Index: get-deps.sh
=======================================

--- get-deps.sh (revision 1442436)

+++ get-deps.sh (working copy)

@@ -115,8 +115,12 @@

get_gtest() {
unzip -q $TEMPDIR/$GTEST.zip
- mv $GTEST gtest
+ mv $GTEST gtestlib

And then this:

Index: Makefile.in
=======================================

--- Makefile.in (revision 1442436)

+++ Makefile.in (working copy)

@@ -135,7 +135,9 @@

APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
APACHE_LDFLAGS = @APACHE_LDFLAGS@
+GTEST_INCLUDES = -Igtest -Igtest/include

and scratch my head in confusion ... is it in gtestlib, or gtest? :)

-- Brane

-- 
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com