[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35326] trunk/blender/build_files/cmake/ cmake_qtcreator_project.py: fix error in qtcreator project file arg checking and check for cmake files .

Campbell Barton ideasman42 at gmail.com
Thu Mar 3 12:22:55 CET 2011


Revision: 35326
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35326
Author:   campbellbarton
Date:     2011-03-03 11:22:54 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
fix error in qtcreator project file arg checking and check for cmake files.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_qtcreator_project.py

Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-03-03 10:34:04 UTC (rev 35325)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-03-03 11:22:54 UTC (rev 35326)
@@ -49,7 +49,7 @@
 # extension checking
 def is_cmake(filename):
     ext = splitext(filename)[1]
-    return (ext == ".cmake") or (filename == "CMakeLists.txt")
+    return (ext == ".cmake") or (filename.endswith("CMakeLists.txt"))
 
 
 def is_c_header(filename):
@@ -92,9 +92,9 @@
 
     cmake_dir = sys.argv[-1]
 
-    if not os.path.join(cmake_dir, "CMakeCache.txt"):
+    if not os.path.exists(os.path.join(cmake_dir, "CMakeCache.txt")):
         cmake_dir = os.getcwd()
-    if not os.path.join(cmake_dir, "CMakeCache.txt"):
+    if not os.path.exists(os.path.join(cmake_dir, "CMakeCache.txt")):
         print("CMakeCache.txt not found in %r or %r\n    Pass CMake build dir as an argument, or run from that dir, abording" % (cmake_dir, os.getcwd()))
         sys.exit(1)
 




More information about the Bf-blender-cvs mailing list