From 7ade2d71905f62b2ff2ce20906ca96d95e1ecf3a Mon Sep 17 00:00:00 2001 From: ap Date: Thu, 5 Oct 2006 19:38:48 +0000 Subject: [PATCH] 2006-10-05 Nikolas Zimmermann 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 --- WebKitTools/ChangeLog | 9 +++++++++ WebKitTools/Scripts/webkitdirs.pm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index fa08bc9d7f3a..061a39f6a52f 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,12 @@ +2006-10-05 Nikolas Zimmermann + + 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 Reviewed by Stephanie. diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm index f31b60566d20..75fe74cf24de 100644 --- 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"; -- 2.36.0