Skip to content
Permalink
Browse files
[GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
https://bugs.webkit.org/show_bug.cgi?id=129380

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject): Check for the existence of the Makefile before
skipping CMake execution.

Canonical link: https://commits.webkit.org/147773@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@165111 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mrobinson committed Mar 5, 2014
1 parent 0acc4a7 commit 190cf85cd24d134ab76ec7b80b66421a14b2cd93
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
@@ -1,3 +1,14 @@
2014-03-05 Martin Robinson <mrobinson@igalia.com>

[GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
https://bugs.webkit.org/show_bug.cgi?id=129380

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject): Check for the existence of the Makefile before
skipping CMake execution.

2014-03-05 Martin Robinson <mrobinson@igalia.com>

[GTK] The jhbuild environment should have the latest stable release of gtk-doc
@@ -1979,7 +1979,7 @@ sub generateBuildSystemFromCMakeProject
chdir($buildPath) or die;

# For GTK+ we try to be smart about when to rerun cmake, so that we can have faster incremental builds.
if (isGtk() && -e cmakeCachePath()) {
if (isGtk() && -e cmakeCachePath() && -e File::Spec->catfile(baseProductDir(), configuration(), "Makefile")) {
return 0;
}

0 comments on commit 190cf85

Please sign in to comment.