Merge pull request CxxTest#99 from ptomulik/fix-none-bug

fixed bug with "None" appearing in $CXXTEST_CPPPATH
textmate · Feb 23, 2014 · 322da36 · 322da36
2 parents 874ca1c + 78abf32
commit 322da36
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build_tools/SCons/cxxtest.py b/build_tools/SCons/cxxtest.py
@@ -214,9 +214,11 @@ def findCxxTestHeaders(env):
     alt_path = os_cxxtestgen[:-cxxtestgen_pathlen]
 
     searchpaths = [default_path, alt_path]
+    foundpaths = []
     for p in searchpaths:
         if os.path.exists(os.path.join(p, 'cxxtest', searchfile)):
-            return p
+            foundpaths.append(p)
+    return foundpaths
 
 def generate(env, **kwargs):
     """
@@ -286,7 +288,7 @@ def generate(env, **kwargs):
         env["CXXTEST"] = findCxxTestGen(env)
 
     # find and add the CxxTest headers to the path.
-    env.AppendUnique( CXXTEST_CPPPATH = [findCxxTestHeaders(env)]  )
+    env.AppendUnique( CXXTEST_CPPPATH = findCxxTestHeaders(env)  )
 
     cxxtest = env['CXXTEST']
     if cxxtest: