Title: [157562] trunk
- Revision
- 157562
- Author
- [email protected]
- Date
- 2013-10-17 00:46:22 -0700 (Thu, 17 Oct 2013)
Log Message
[CMAKE] Update code to take advantage of CMake version 2.8.3+.
https://bugs.webkit.org/show_bug.cgi?id=97516
Patch by Afonso R. Costa Jr. <[email protected]> on 2013-10-17
Reviewed by Gyuyoung Kim.
CMake's version was changed to 2.8.3. So, these files below
can be simplified to take advantage of CMake's new version.
* Source/cmake/FindCairo.cmake: Simplified according to CMake 2.8.3+.
* Source/cmake/FindGStreamer.cmake: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (157561 => 157562)
--- trunk/ChangeLog 2013-10-17 07:28:37 UTC (rev 157561)
+++ trunk/ChangeLog 2013-10-17 07:46:22 UTC (rev 157562)
@@ -1,3 +1,16 @@
+2013-10-17 Afonso R. Costa Jr. <[email protected]>
+
+ [CMAKE] Update code to take advantage of CMake version 2.8.3+.
+ https://bugs.webkit.org/show_bug.cgi?id=97516
+
+ Reviewed by Gyuyoung Kim.
+
+ CMake's version was changed to 2.8.3. So, these files below
+ can be simplified to take advantage of CMake's new version.
+
+ * Source/cmake/FindCairo.cmake: Simplified according to CMake 2.8.3+.
+ * Source/cmake/FindGStreamer.cmake: Ditto.
+
2013-10-16 Ryosuke Niwa <[email protected]>
Add a new flakiness dashboard clone
Modified: trunk/Source/cmake/FindCairo.cmake (157561 => 157562)
--- trunk/Source/cmake/FindCairo.cmake 2013-10-17 07:28:37 UTC (rev 157561)
+++ trunk/Source/cmake/FindCairo.cmake 2013-10-17 07:46:22 UTC (rev 157562)
@@ -29,7 +29,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(PC_CAIRO cairo) # FIXME: After we require CMake 2.8.2 we can pass QUIET to this call.
+pkg_check_modules(PC_CAIRO QUIET cairo)
find_path(CAIRO_INCLUDE_DIRS
NAMES cairo.h
@@ -61,21 +61,10 @@
endif ()
endif ()
-# FIXME: Should not be needed anymore once we start depending on CMake 2.8.3
-set(VERSION_OK TRUE)
-if (Cairo_FIND_VERSION)
- if (Cairo_FIND_VERSION_EXACT)
- if ("${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}")
- # FIXME: Use if (NOT ...) with CMake 2.8.2+ to get rid of the ELSE block
- else ()
- set(VERSION_OK FALSE)
- endif ()
- else ()
- if ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
- endif ()
+if ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}")
+ message(FATAL_ERROR "Required version ("${Cairo_FIND_VERSION}") is higher than found version ("${CAIRO_VERSION}")")
endif ()
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo DEFAULT_MSG CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES VERSION_OK)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo REQUIRED_VARS CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES
+ VERSION_VAR CAIRO_VERSION)
Modified: trunk/Source/cmake/FindGStreamer.cmake (157561 => 157562)
--- trunk/Source/cmake/FindGStreamer.cmake 2013-10-17 07:28:37 UTC (rev 157561)
+++ trunk/Source/cmake/FindGStreamer.cmake 2013-10-17 07:46:22 UTC (rev 157562)
@@ -53,8 +53,7 @@
# _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
# _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
- # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
- pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+ pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name})
find_path(${_component_prefix}_INCLUDE_DIRS
NAMES ${_header}
@@ -94,17 +93,8 @@
endif ()
endif ()
-# FIXME: With CMake 2.8.3 we can just pass GSTREAMER_VERSION to FIND_PACKAGE_HANDLE_STANDARD_ARGS as VERSION_VAR
-# and remove the version check here (GSTREAMER_FIND_VERSION would be passed to FIND_PACKAGE).
-set(VERSION_OK TRUE)
-if (GSTREAMER_FIND_VERSION_EXACT)
- if (NOT(("${GSTREAMER_FIND_VERSION}" VERSION_EQUAL "${GSTREAMER_VERSION}")))
- set(VERSION_OK FALSE)
- endif ()
-else ()
- if ("${GSTREAMER_VERSION}" VERSION_LESS "${GSTREAMER_FIND_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
+if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}")
+ message(FATAL_ERROR "Required version ("${GStreamer_FIND_VERSION}") is higher than found version ("${GSTREAMER_VERSION}")")
endif ()
# -------------------------
@@ -120,7 +110,7 @@
# ------------------------------------------------
# 3. Process the COMPONENTS passed to FIND_PACKAGE
# ------------------------------------------------
-set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
+set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_VERSION GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
foreach (_component ${GStreamer_FIND_COMPONENTS})
set(_gst_component "GSTREAMER_${_component}")
@@ -130,4 +120,5 @@
endforeach ()
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS})
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
+ VERSION_VAR GSTREAMER_VERSION)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
