Title: [127003] trunk/Tools
- Revision
- 127003
- Author
- [email protected]
- Date
- 2012-08-29 09:06:26 -0700 (Wed, 29 Aug 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
Reviewed by Gustavo Noronha Silva.
Most of the warnings have been fixed now that FindCairo.cmake and
FindGLIB.cmake have been rewritten. The remaining one, related to
FindFontconfig.cmake, shows up when building on a 64-bit
Debian-based systems.
jhbuild installs libraries into lib64/ by default on 64-bit Linux
installations, while CMake does not look for libraries in lib64/
when /etc/debian_version exists on the system. The FIND_LIBRARY()
would then sometimes end up using the system installation instead of
the jhbuild one, causing mismatches and, when pkg-config is not used
at all, failing to find libraries altogether.
* efl/jhbuildrc: Set the CMAKE_LIBRARY_PATH environment variable
when use_lib64 is set to force CMake to look into lib64/ regardless
of the presence of /etc/debian_version.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127002 => 127003)
--- trunk/Tools/ChangeLog 2012-08-29 15:39:05 UTC (rev 127002)
+++ trunk/Tools/ChangeLog 2012-08-29 16:06:26 UTC (rev 127003)
@@ -1,3 +1,26 @@
+2012-08-29 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Resolve CMake warnings on overlapping search paths for EFL jhbuild-enabled build
+ https://bugs.webkit.org/show_bug.cgi?id=84707
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Most of the warnings have been fixed now that FindCairo.cmake and
+ FindGLIB.cmake have been rewritten. The remaining one, related to
+ FindFontconfig.cmake, shows up when building on a 64-bit
+ Debian-based systems.
+
+ jhbuild installs libraries into lib64/ by default on 64-bit Linux
+ installations, while CMake does not look for libraries in lib64/
+ when /etc/debian_version exists on the system. The FIND_LIBRARY()
+ would then sometimes end up using the system installation instead of
+ the jhbuild one, causing mismatches and, when pkg-config is not used
+ at all, failing to find libraries altogether.
+
+ * efl/jhbuildrc: Set the CMAKE_LIBRARY_PATH environment variable
+ when use_lib64 is set to force CMake to look into lib64/ regardless
+ of the presence of /etc/debian_version.
+
2012-08-29 Dominik Röttsches <[email protected]>
The 2d.imageData.object.round canvas test is failing
Modified: trunk/Tools/efl/jhbuildrc (127002 => 127003)
--- trunk/Tools/efl/jhbuildrc 2012-08-29 15:39:05 UTC (rev 127002)
+++ trunk/Tools/efl/jhbuildrc 2012-08-29 16:06:26 UTC (rev 127003)
@@ -63,4 +63,13 @@
addpath('CMAKE_PREFIX_PATH', prefix)
+# jhbuild installs libraries into lib64/ by default when building on
+# 64-bit Linux installations, while CMake does not look for libraries
+# in lib64/ if /etc/debian_version exists. For now we just pass the
+# lib64/ directory to the CMAKE_LIBRARY_PATH environment variable to
+# make sure the libraries installed by jhbuild are found by CMake on
+# Debian-based systems as well.
+if use_lib64:
+ addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _libdir))
+
partial_build = False
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
