Merge lp:~fginther/unity/unity-revert-gtest into lp:unity

[Francis Ginther]

Commenting out setting of GTEST_INCLUDE_DIR in CMakeLists.txt.

This is causing builds to fail in launchpad unity-team/staging ppa due to missing dependencies.

Commenting out setting of GTEST_INCLUDE_DIR in CMakeLists.txt.

This is causing builds to fail in launchpad unity-team/staging ppa due to missing dependencies.
https://launchpadlibrarian.net/122383545/buildlog_ubuntu-quantal-amd64.unity_6.10.0bzr2884pkg0quantal0_FAILEDTOBUILD.txt.gz

[Testing]
 - Performed two test builds inside a chroot pbuilder. Build progressed beyond point of failure in launchpad.

[Tim Penhey (thumper)]

Looks like a reasonable solution for now.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Hum, the packaging is in bzr upstream, you can add the build-dep yourself now (which should have been better than reverting this). Anyway, let's try to fix this:
1. Why did it pass the pbuilder? Francis, I think that for packages with inline debian/, you should use the hook to install more build-dep for testing and just relying on the packaging one. Can you please tweak that? (That would have enabled us to fail in pbuilder, not launchpad)
2. I will ask to create a MIR (https://wiki.ubuntu.com/MainInclusionProcess) to get google-mock promoted to main for raring
3. Then, proposing a merge request adding those dep to the packaging and reverting this MR.

[Timo Jyrinki (timo-jyrinki)]

2. MIR created at https://bugs.launchpad.net/ubuntu/+source/google-mock/+bug/1076891

[Francis Ginther (fginther)]

Didier,

1. It made it past the auto-merge pbuilder because it adds a set of common test packages (google-mock, etc.) via a pre-build hook. This needs to be tweaked after being exposed as an issue here.

[Didier Roche-Tolomelli (didrocks)]

Reviewed and promoted in main now after some google-mock fixes.

3. Added them as build-dep and proposed https://code.launchpad.net/~didrocks/unity/add-gtest-build-dep/+merge/133637 to revert this.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-08 11:14:37 +0000
+++ CMakeLists.txt	2012-11-08 22:02:26 +0000
@@ -182,13 +182,17 @@
   "Path to Google test srcs"
 )
 
-set(
-  GTEST_INCLUDE_DIR
-  "/usr/include/gtest"
-  CACHE
-  PATH
-  "Path to Google tests include"
-)
+# Commenting out the following block added in rev 2884 which is causing
+#   builds to break in launchpad.
+# This requires dependencies on libgtest-dev and google-mock which are not
+#   specified in the packaging.
+#set(
+#  GTEST_INCLUDE_DIR
+#  "/usr/include/gtest"
+#  CACHE
+#  PATH
+#  "Path to Google tests include"
+#)
 
 find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
 if (GTEST_INCLUDE_DIR)