gtest: Test presence of source on existing file
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 10 Mar 2017 17:29:56 +0000 (18:29 +0100)
committerAshok Babu Channa <ashok.channa@samsung.com>
Wed, 22 Mar 2017 13:59:23 +0000 (13:59 +0000)
configure is not in upstream's repo
because, it's intended to be generated from configure.ac.

So to avoid ambiguity, we test if CMake file is present instead.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ia2e7c8c4d0c827b300b9345c9cb7811a193cfd9e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17855
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
extlibs/gtest/SConscript

index 4b4d384..de39e93 100644 (file)
@@ -23,7 +23,7 @@ gtest_url = 'https://github.com/google/googletest/archive/release-1.7.0.zip'
 
 if target_os in targets_need_gtest:
        print '*** Checking for installation of google unit test 1.7.0 ***'
-       if not os.path.exists(os.path.join(gtest_dir, 'configure')):
+       if not os.path.exists(os.path.join(gtest_dir, 'CMakeLists.txt')):
                # If the gtest zip file is not already present, download it
                if not os.path.exists(gtest_zip_file):
                        gtest_zip = gtest_env.Download(gtest_zip_file, gtest_url)