Title: [120113] trunk/Tools
- Revision
- 120113
- Author
- [email protected]
- Date
- 2012-06-12 13:38:01 -0700 (Tue, 12 Jun 2012)
Log Message
[EFL] Resolve CMake warnings on overlapping search paths for EFL jhbuild-enabled build
https://bugs.webkit.org/show_bug.cgi?id=84707
Fixing CMAKE prefix path for 64bit systems to avoid CMAKE warnings on those.
use_lib64 variable is preconfigured to True by jhbuild.
Patch by Dominik Röttsches <[email protected]> on 2012-06-12
Reviewed by Dirk Pranke.
* efl/jhbuildrc:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120112 => 120113)
--- trunk/Tools/ChangeLog 2012-06-12 20:37:16 UTC (rev 120112)
+++ trunk/Tools/ChangeLog 2012-06-12 20:38:01 UTC (rev 120113)
@@ -1,3 +1,15 @@
+2012-06-12 Dominik Röttsches <[email protected]>
+
+ [EFL] Resolve CMake warnings on overlapping search paths for EFL jhbuild-enabled build
+ https://bugs.webkit.org/show_bug.cgi?id=84707
+
+ Fixing CMAKE prefix path for 64bit systems to avoid CMAKE warnings on those.
+ use_lib64 variable is preconfigured to True by jhbuild.
+
+ Reviewed by Dirk Pranke.
+
+ * efl/jhbuildrc:
+
2012-06-12 Dana Jansens <[email protected]>
Add [email protected] to contributors list
Modified: trunk/Tools/efl/jhbuildrc (120112 => 120113)
--- trunk/Tools/efl/jhbuildrc 2012-06-12 20:37:16 UTC (rev 120112)
+++ trunk/Tools/efl/jhbuildrc 2012-06-12 20:38:01 UTC (rev 120113)
@@ -61,6 +61,10 @@
addpath('XDG_DATA_DIRS', '/usr/share')
addpath('XDG_CONFIG_DIRS', '/etc/xdg')
-addpath('CMAKE_PREFIX_PATH', prefix)
+# Avoid overlapping search path CMAKE warning on 64bit systems.
+if (use_lib64):
+ addpath('CMAKE_PREFIX_PATH', os.path.join(os.sep, prefix, 'lib64'))
+else:
+ addpath('CMAKE_PREFIX_PATH', prefix)
partial_build = False
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
