Changeset 100241 in webkit

Timestamp:

Nov 14, 2011, 10:43:01 PM (15 years ago)

Author:

dbates@webkit.org

Message:

build-webkit: Accept --cmakearg to pass additional arguments to CMake.
​https://bugs.webkit.org/show_bug.cgi?id=72156

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-11-14
Reviewed by Daniel Bates.

Similar to --makearg and --qmakearg, --cmakearg lets one pass
additional arguments to CMake (eg. --cmakearg="-DFOO=bar").

• Scripts/build-webkit:
• Scripts/webkitdirs.pm:

(generateBuildSystemFromCMakeProject):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (4 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-14  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        build-webkit: Accept --cmakearg to pass additional arguments to CMake.
+        https://bugs.webkit.org/show_bug.cgi?id=72156
+
+        Reviewed by Daniel Bates.
+
+        Similar to --makearg and --qmakearg, --cmakearg lets one pass
+        additional arguments to CMake (eg. --cmakearg="-DFOO=bar").
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (generateBuildSystemFromCMakeProject):
+
 2011-11-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/build-webkit

@@ -60 +60 @@
 my $prefixPath;
 my $makeArgs = "";
+my $cmakeArgs;
 my $onlyWebKitProject = 0;
 my $noWebKit2 = 0;
@@ -399 +400 @@
   --makeargs=<arguments>            Optional Makefile flags
   --qmakearg=<arguments>            Optional qmake flags (Qt only, e.g. --qmakearg="CONFIG+=webkit2" to build WebKit2)
+  --cmakearg=<arguments>            Optional CMake flags (e.g. --cmakearg="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
 
   --minimal                         No optional features, unless explicitly enabled
@@ -415 +417 @@
     'prefix=s' => \$prefixPath,
     'makeargs=s' => \$makeArgs,
+    'cmakeargs=s' => \$cmakeArgs,
     'minimal' => \$minimal,
     'v8' => \$v8,
@@ -621 +624 @@
     # By default we build using all of the available CPUs.
     $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
-    buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, cMakeArgsFromFeatures());
+    buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, cMakeArgsFromFeatures(), $cmakeArgs);
 }
 
 if (isWinCE()) {
-    buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, ("-DCMAKE_WINCE_SDK=\"STANDARDSDK_500 (ARMV4I)\"", cMakeArgsFromFeatures()));
+    buildCMakeProjectOrExit($clean, "WinCE", $prefixPath, $makeArgs, ("-DCMAKE_WINCE_SDK=\"STANDARDSDK_500 (ARMV4I)\"", cMakeArgsFromFeatures()), $cmakeArgs);
 }
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1640 +1640 @@
 sub generateBuildSystemFromCMakeProject
 {
-    my ($port, $prefixPath, @cmakeArgs) = @_;
+    my ($port, $prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
     my $config = configuration();
     my $buildPath = File::Spec->catdir(baseProductDir(), $config);
@@ -1656 +1656 @@
     }
     push @args, @cmakeArgs if @cmakeArgs;
+    push @args, $additionalCMakeArgs if $additionalCMakeArgs;
+
     push @args, '"' . File::Spec->catdir(sourceDir(), "Source") . '"';