[PATCH xorg-gtest] Ensure xorg-gtest implementation is included in xorg-gtest{-all,_main}.cpp

Chase Douglas chase.douglas at canonical.com
Tue Jul 3 17:55:00 PDT 2012


On 07/02/2012 07:37 PM, Peter Hutterer wrote:
> On Mon, Jun 18, 2012 at 11:17:19AM -0700, Chase Douglas wrote:
>> GNU automake puts -I. -I.. at the beginning of every invocation of g++.
>> This breaks xorg-gtest compilation if there is a file of the same name
>> as an xorg-gtest implementation file in ../src/ or ../../src. For
>> example, if compiling xorg-gtest-all.cpp in /home/user1/library/test
>> and there exists /home/user1/library/src/device.cpp, the library's
>> device.cpp file will be included instead of xorg-gtest's.
>>
>> This change adds a -iquote option to xorg-gtest compilation performed in
>> Makefile-xorg-gtest.am. Directories specified with -iquote are searched
>> ahead of directories specified by -I.
>>
>> This changes Makefile-xorg-gtest.am, which projects can copy to provide
>> rules for building xorg-gtest in autotools projects. For substantial
>> changes, projects will want to import the latest version of this file,
>> but this particular fix is only needed if a project runs into build
>> issues. If your project builds without issue, there is no need to
>> replace the existing version of Makefile-xorg-gtest.am.
>>
>> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
>
> yikes. this custom compilation stuff is certainly messy.
>
> Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

And pushed as 3fefcde53f8b69b37baeec61265f2e0190713fe6.

-- Chase


More information about the xorg-devel mailing list