Permalink
Browse files

[EFL] Resolve CMake warnings on overlapping search paths for EFL jhbu…

…ild-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 <dominik.rottsches@intel.com> on 2012-06-12
Reviewed by Dirk Pranke.

* efl/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120113 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
commit-queue
commit-queue committed Jun 12, 2012
1 parent 0f7024c commit 540b02dad10d5c9d5a56f140f37e112436f6b2ec
Showing with 17 additions and 1 deletion.
  1. +12 −0 Tools/ChangeLog
  2. +5 −1 Tools/efl/jhbuildrc
View
@@ -1,3 +1,15 @@
+2012-06-12 Dominik Röttsches <dominik.rottsches@intel.com>
+
+ [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 <danakj@chromium.org>
Add zlieber@chromium.org to contributors list
View
@@ -61,6 +61,10 @@ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
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

0 comments on commit 540b02d

Please sign in to comment.