diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 14:22:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 14:22:54 +0300 |
commit | c7dc8ddf7dae781d27535475cbf9ea397bf4edcf (patch) | |
tree | cb4d725f1cd0e850fe32927351d5a45041cea52f | |
parent | b6b77b8426318a8f02f3f01c8cd9abe799843470 (diff) |
fix error in qtcreator project file arg checking and check for cmake files.
-rw-r--r-- | build_files/cmake/cmake_qtcreator_project.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 4dfedaf7399..8b5a0a8754c 100644 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -49,7 +49,7 @@ def source_list(path, filename_check=None): # 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 @@ def cmake_advanced_info(): 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) |