Removed make & configure calls on Google Test library in every build.
authorJoseph Morrow <joseph.l.morrow@intel.com>
Thu, 23 Apr 2015 16:33:44 +0000 (12:33 -0400)
committerErich Keane <erich.keane@intel.com>
Thu, 23 Apr 2015 17:27:39 +0000 (17:27 +0000)
By checking for the binary output directory of the Make script for
Google Test, the IoTivity SCons build will stop running the Configure
and Make scripts for every build on Linux.

Change-Id: Ib7ecb52c93fc0d2765ffd0e4112244660e732846
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
extlibs/gtest/SConscript

index 447052f6cdad8056c66eb694b871a4df8363ad27..522b3e1747327db334169c001a12dd30174b0aed 100644 (file)
@@ -65,12 +65,13 @@ if target_os == 'darwin':
 
 elif target_os == 'linux':
        if os.path.exists(gtest_dir):
-               # Run configure on gtest
-               print 'Configuring google unit test'
-               env.Configure(gtest_dir, './configure')
+               if not os.path.exists(gtest_dir + "/lib"):
+                       # Run configure on gtest
+                       print 'Configuring google unit test'
+                       env.Configure(gtest_dir, './configure')
 
-               # Run make on gtest
-               print 'Making google unit test'
-               env.Configure(gtest_dir, 'make')
+                       # Run make on gtest
+                       print 'Making google unit test'
+                       env.Configure(gtest_dir, 'make')