kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix error in qtcreator project file arg checking and check for cmake files.

Browse Source
This commit is contained in:
Campbell Barton 2011-03-03 11:22:54 +00:00
parent b6b77b8426
commit c7dc8ddf7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/cmake_qtcreator_project.py
View File

@ -49,7 +49,7 @@ def source_list(path, filename_check=None):
# extension checking # extension checking
def is_cmake(filename): def is_cmake(filename):
ext = splitext(filename)[1] ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt") return (ext == ".cmake") or (filename.endswith("CMakeLists.txt"))
def is_c_header(filename): def is_c_header(filename):
@ -92,9 +92,9 @@ def cmake_advanced_info():
cmake_dir = sys.argv[-1] 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() 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())) 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) sys.exit(1)