2006-10-05 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed and landed by ap.

        Cmake: make it possible to install the libraries after having built using 'build-webkit'.
        Just set the "WebKitInstallationPrefix" environment variable to your desired prefix.

        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fa08bc9d7f3ac9c13221633367137b7315c12021..061a39f6a52f0d76e80bf6a0319b05959be157dc 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-05  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed and landed by ap.
+
+        Cmake: make it possible to install the libraries after having built using 'build-webkit'.
+        Just set the "WebKitInstallationPrefix" environment variable to your desired prefix.
+
+        * Scripts/webkitdirs.pm:
+
 2006-10-04  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Stephanie.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index f31b60566d202cbe2d4ee49a613bf74611ff57d1..75fe74cf24de34408af62485c79293ad2f1a0e19 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -397,12 +397,15 @@ sub buildCMakeProject($$)
     }
 
     my $config = configuration();
+    my $prefix = $ENV{"WebKitInstallationPrefix"};
  
     my @buildArgs = ("-DCMAKE_BUILD_TYPE=$config");
+    push @buildArgs, "-DCMAKE_INSTALL_PREFIX=" . $prefix if(defined($prefix));
     push @buildArgs, "-DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=" . ($colorize ? "OFF" : "ON");
     push @buildArgs, "../../";
 
     print "Calling 'cmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
+    print "Installation directory: $prefix\n" if(defined($prefix));
 
     system "mkdir -p " . baseProductDir() . "/$config";
     chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";