Title: [215221] trunk
- Revision
- 215221
- Author
- [email protected]
- Date
- 2017-04-11 01:29:43 -0700 (Tue, 11 Apr 2017)
Log Message
[CMake] OpenWebRTC libraries path isn't properly deduced
https://bugs.webkit.org/show_bug.cgi?id=170670
Reviewed by Carlos Garcia Campos.
When using OpenWebRTC installation that's outside of the usual Jhbuild
installation directories, the library paths are ignored because the
dependency libraries are simply gathered from the pkg-config file.
Instead, the pkg-config data should be used to search for the correct
paths to the header and library locations. Both libopenwebrtc and
libopenwebrtc_gst libraries are needed, so the two library paths are
concatenated into the OPENWEBRTC_LIBRARIES variable.
* Source/cmake/FindOpenWebRTC.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (215220 => 215221)
--- trunk/ChangeLog 2017-04-11 08:27:28 UTC (rev 215220)
+++ trunk/ChangeLog 2017-04-11 08:29:43 UTC (rev 215221)
@@ -1,3 +1,21 @@
+2017-04-11 Zan Dobersek <[email protected]>
+
+ [CMake] OpenWebRTC libraries path isn't properly deduced
+ https://bugs.webkit.org/show_bug.cgi?id=170670
+
+ Reviewed by Carlos Garcia Campos.
+
+ When using OpenWebRTC installation that's outside of the usual Jhbuild
+ installation directories, the library paths are ignored because the
+ dependency libraries are simply gathered from the pkg-config file.
+
+ Instead, the pkg-config data should be used to search for the correct
+ paths to the header and library locations. Both libopenwebrtc and
+ libopenwebrtc_gst libraries are needed, so the two library paths are
+ concatenated into the OPENWEBRTC_LIBRARIES variable.
+
+ * Source/cmake/FindOpenWebRTC.cmake:
+
2017-04-08 Ting-Wei Lan <[email protected]>
Elftoolchain ar doesn't support response files
Modified: trunk/Source/cmake/FindOpenWebRTC.cmake (215220 => 215221)
--- trunk/Source/cmake/FindOpenWebRTC.cmake 2017-04-11 08:27:28 UTC (rev 215220)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake 2017-04-11 08:29:43 UTC (rev 215221)
@@ -30,20 +30,41 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(OPENWEBRTC openwebrtc-0.3 openwebrtc-gst-0.3)
+pkg_check_modules(PC_OPENWEBRTC openwebrtc-0.3 openwebrtc-gst-0.3)
set(VERSION_OK TRUE)
-if (OPENWEBRTC_VERSION)
+if (PC_OPENWEBRTC_VERSION)
if (OPENWEBRTC_FIND_VERSION_EXACT)
- if (NOT("${OPENWEBRTC_FIND_VERSION}" VERSION_EQUAL "${OPENWEBRTC_VERSION}"))
+ if (NOT("${OPENWEBRTC_FIND_VERSION}" VERSION_EQUAL "${PC_OPENWEBRTC_VERSION}"))
set(VERSION_OK FALSE)
endif ()
else ()
- if ("${OPENWEBRTC_VERSION}" VERSION_LESS "${OPENWEBRTC_FIND_VERSION}")
+ if ("${OPENWEBRTC_VERSION}" VERSION_LESS "${PC_OPENWEBRTC_FIND_VERSION}")
set(VERSION_OK FALSE)
endif ()
endif ()
endif ()
+find_path(OPENWEBRTC_INCLUDE_DIRS
+ NAMES owr/owr.h
+ HINTS ${PC_OPENWEBRTC_INCLUDEDIR} ${PC_OPENWEBRTC_INCLUDE_DIRS}
+)
+
+find_library(OPENWEBRTC_LIBRARY
+ NAMES openwebrtc
+ HINTS ${PC_OPENWEBRTC_LIBDIR} ${PC_OPENWEBRTC_LIBRARY_DIRS}
+)
+find_library(OPENWEBRTC_GST_LIBRARY
+ NAMES openwebrtc_gst
+ HINTS ${PC_OPENWEBRTC_LIBDIR} ${PC_OPENWEBRTC_LIBRARY_DIRS}
+)
+
+set(OPENWEBRTC_LIBRARIES
+ ${OPENWEBRTC_LIBRARY}
+ ${OPENWEBRTC_GST_LIBRARY}
+)
+
+mark_as_advanced(OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES)
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENWEBRTC DEFAULT_MSG OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
